Module Name: src
Committed By: bouyer
Date: Thu May 25 18:26:36 UTC 2017
Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_can.c
Log Message:
abort may clear sc_m_transmit but leave OACTIVE, so unconditionally clear
OACTIVE in TX interrupt.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/arch/arm/allwinner/awin_can.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_can.c
diff -u src/sys/arch/arm/allwinner/awin_can.c:1.1.2.7 src/sys/arch/arm/allwinner/awin_can.c:1.1.2.8
--- src/sys/arch/arm/allwinner/awin_can.c:1.1.2.7 Thu May 25 18:23:15 2017
+++ src/sys/arch/arm/allwinner/awin_can.c Thu May 25 18:26:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_can.c,v 1.1.2.7 2017/05/25 18:23:15 bouyer Exp $ */
+/* $NetBSD: awin_can.c,v 1.1.2.8 2017/05/25 18:26:36 bouyer Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.7 2017/05/25 18:23:15 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.8 2017/05/25 18:26:36 bouyer Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -297,9 +297,8 @@ awin_can_tx_intr(struct awin_can_softc *
can_input(ifp, m); /* loopback */
sc->sc_m_transmit = NULL;
ifp->if_timer = 0;
- ifp->if_flags &= ~IFF_OACTIVE;
}
-
+ ifp->if_flags &= ~IFF_OACTIVE;
if_schedule_deferred_start(ifp);
}
