summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorrin <rin@NetBSD.org>2019-08-26 17:26:33 +0000
committerrin <rin@NetBSD.org>2019-08-26 17:26:33 +0000
commit5c867230fe6ca915bd1da9b362a95da31b993429 (patch)
treefcb6eb870420042d67f4561a9c8f03577f4f61af /sys/dev
parent59b03441e71de7ea46166177d6ba40ba06e439ea (diff)
PR kern/54486
Revert workaround introduced in rev 1.94: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/usb/if_axe.c#rev1.94 This is a problem specific to ARMv6+, and addressed by arch/arm/conf/Makefile.arm rev 1.50: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/arm/conf/Makefile.arm#rev1.50 XXX pullup netbsd-9
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/if_axe.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 56fe384c393..80410170295 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.119 2019/08/23 04:32:57 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.120 2019/08/26 17:26:33 rin Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.119 2019/08/23 04:32:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.120 2019/08/26 17:26:33 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1038,18 +1038,7 @@ axe_rx_loop(struct usbnet * un, struct usbnet_chain *c, uint32_t total_len)
break;
}
-#if !defined(__NO_STRICT_ALIGNMENT) && __GNUC_PREREQ__(6, 1)
- /*
- * XXX hdr is 2-byte aligned in buf, not 4-byte.
- * For some architectures, __builtin_memcpy() of
- * GCC 6 attempts to copy sizeof(hdr) = 4 bytes
- * at onece, which results in alignment error.
- */
- hdr.len = *(uint16_t *)buf;
- hdr.ilen = *(uint16_t *)(buf + sizeof(uint16_t));
-#else
memcpy(&hdr, buf, sizeof(hdr));
-#endif
DPRINTFN(20, "total_len %#jx len %jx ilen %#jx",
total_len,