svn commit: r356700 - in head/stand: efi/libefi i386/libi386 libofw uboot/lib

[Toomas Soome]

Author: tsoome
Date: Mon Jan 13 20:02:27 2020
New Revision: 356700
URL: https://svnweb.freebsd.org/changeset/base/356700

Log:
  Backout 356693. The libsa malloc does provide necessary alignment and
  memalign by 4 will reduce alignment for some platforms. Thanks for Ian for
  pointing this out.

Modified:
  head/stand/efi/libefi/efinet.c
  head/stand/i386/libi386/pxe.c
  head/stand/libofw/ofw_net.c
  head/stand/uboot/lib/net.c

Modified: head/stand/efi/libefi/efinet.c
==============================================================================
--- head/stand/efi/libefi/efinet.c	Mon Jan 13 19:34:15 2020	(r356699)
+++ head/stand/efi/libefi/efinet.c	Mon Jan 13 20:02:27 2020	(r356700)
@@ -178,7 +178,7 @@ efinet_get(struct iodesc *desc, void **pkt, time_t tim
 		return (ret);
 
 	bufsz = net->Mode->MaxPacketSize + ETHER_HDR_LEN + ETHER_CRC_LEN;
-	buf = memalign(4, bufsz + ETHER_ALIGN);
+	buf = malloc(bufsz + ETHER_ALIGN);
 	if (buf == NULL)
 		return (ret);
 	ptr = buf + ETHER_ALIGN;

Modified: head/stand/i386/libi386/pxe.c
==============================================================================
--- head/stand/i386/libi386/pxe.c	Mon Jan 13 19:34:15 2020	(r356699)
+++ head/stand/i386/libi386/pxe.c	Mon Jan 13 20:02:27 2020	(r356700)
@@ -484,7 +484,7 @@ pxe_netif_receive(void **pkt)
 	}
 
 	size = isr->FrameLength;
-	buf = memalign(4, size + ETHER_ALIGN);
+	buf = malloc(size + ETHER_ALIGN);
 	if (buf == NULL) {
 		bio_free(isr, sizeof(*isr));
 		return (-1);

Modified: head/stand/libofw/ofw_net.c
==============================================================================
--- head/stand/libofw/ofw_net.c	Mon Jan 13 19:34:15 2020	(r356699)
+++ head/stand/libofw/ofw_net.c	Mon Jan 13 20:02:27 2020	(r356700)
@@ -142,7 +142,7 @@ ofwn_get(struct iodesc *desc, void **pkt, time_t timeo
 	 * a small shortcut here.
 	 */
 	len = ETHER_MAX_LEN;
-	buf = memalign(4, len + ETHER_ALIGN);
+	buf = malloc(len + ETHER_ALIGN);
 	if (buf == NULL)
 		return (-1);
 	ptr = buf + ETHER_ALIGN;

Modified: head/stand/uboot/lib/net.c
==============================================================================
--- head/stand/uboot/lib/net.c	Mon Jan 13 19:34:15 2020	(r356699)
+++ head/stand/uboot/lib/net.c	Mon Jan 13 20:02:27 2020	(r356700)
@@ -302,7 +302,7 @@ net_get(struct iodesc *desc, void **pkt, time_t timeou
 #endif
 
 	if (rlen > 0) {
-		buf = memalign(4, rlen + ETHER_ALIGN);
+		buf = malloc(rlen + ETHER_ALIGN);
 		if (buf == NULL)
 			return (-1);
 		memcpy(buf + ETHER_ALIGN, sc->sc_rxbuf, rlen);