 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.arm,v 1.49 2018/09/22 12:24:01 rin Exp $
+#	$NetBSD: Makefile.arm,v 1.49.4.1 2019/09/01 14:03:02 martin Exp $
 # Makefile for NetBSD
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/<arch>/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/arm/conf/Makefile.arm
 # after which config should be rerun for all machines of that type.
+#
 @@ -43,26 +43,46 @@ AFLAGS.fusu.S+=-marm
 AFLAGS.exception.S+=-marm
 AFLAGS.irq_dispatch.S+=-marm
 AFLAGS.blockio.S+=-marm
 AFLAGS.copystr.S+=-marm
 CFLAGS+=	 -mfloat-abi=soft
 # This files use instructions deprecated for ARMv7+, but still
 # included in kernel that build with higher -mcpu=... settings.
 CPPFLAGS.cpufunc_asm_armv4.S+=	-mcpu=arm8
 CPPFLAGS.cpufunc_asm_armv6.S+=	-mcpu=arm1136j-s
 CPPFLAGS.cpufunc_asm_arm11.S+=	-mcpu=arm1136j-s
 CPPFLAGS.cpufunc_asm_xscale.S+=	-mcpu=xscale
 .if !empty(MACHINE_ARCH:Mearmv6*) || !empty(MACHINE_ARCH:Mearmv7*)
 # XXX
+#
 # Workaround for alignment faults on ARMv6+, at least occur with
 # axe(4) and athn(4) drivers.
+#
 # For ARMv6+, unaligned access is enabled by default. However, it
 # cannot be used for non-cacheable memory, which is used as DMA
 # buffers. This results in alignment faults above. A real fix is
 # to use cacheable memory as DMA buffers. However, it breaks some
 # drivers, awge(4) and vchiq(4) at least.
+#
 # Until we figure out problems and fix them, we choose a fail-safe
 # workaround here; forbid unaligned memory access for whole kernel.
 # Affects on performance is negligibly small as far as we can see.
+#
 # See PR kern/54486 for more details.
 CFLAGS+=	-mno-unaligned-access
 .endif
 ##
 ## (3) libkern and compat
 ##
 OPT_MODULAR=	%MODULAR%
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS+=	${SYSTEM_FIRST_OBJ} locore.o
 MD_CFILES+=
 MD_SFILES+=	${SYSTEM_FIRST_SFILE} ${ARM}/arm32/locore.S
 .if defined(SYSTEM_FIRST_OBJ)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_axe.c,v 1.102.2.1 2019/09/01 13:00:36 martin Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.102.2.2 2019/09/01 14:03:02 martin Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -77,27 +77,27 @@
  * (Adam Weinberger wanted me to name this driver if_gir.c.)
  */
 /*
  * Ax88178 and Ax88772 support backported from the OpenBSD driver.
  * 2007/02/12, J.R. Oldroyd, fbsd@opal.com
+ *
  * Manual here:
  * http://www.asix.com.tw/FrootAttach/datasheet/AX88178_datasheet_Rev10.pdf
  * http://www.asix.com.tw/FrootAttach/datasheet/AX88772_datasheet_Rev10.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.102.2.1 2019/09/01 13:00:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.102.2.2 2019/09/01 14:03:02 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbhist.h>
 #include <dev/usb/if_axereg.h>
 struct axe_type {
 @@ -1028,38 +1028,27 @@ axe_rx_loop(struct usbnet * un, struct u
 	do {
 		u_int pktlen = 0;
 		u_int rxlen = 0;
 		int flags = 0;
 		if ((un->un_flags & AXSTD_FRAME) != 0) {
 			struct axe_sframe_hdr hdr;
 			if (total_len < sizeof(hdr)) {
 				ifp->if_ierrors++;
 				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,
 			    (le16toh(hdr.len) & AXE_RH1M_RXLEN_MASK),
 			    (le16toh(hdr.ilen) & AXE_RH1M_RXLEN_MASK), 0);
 			total_len -= sizeof(hdr);
 			buf += sizeof(hdr);
 			if (((le16toh(hdr.len) & AXE_RH1M_RXLEN_MASK) ^
 			    (le16toh(hdr.ilen) & AXE_RH1M_RXLEN_MASK)) !=
 			    AXE_RH1M_RXLEN_MASK) {
 				ifp->if_ierrors++;