Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/arch/arm/allwinner Pull up following revision(s) (req...



details:   https://anonhg.NetBSD.org/src/rev/0c194b355cb7
branches:  netbsd-8
changeset: 434077:0c194b355cb7
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jul 05 20:06:26 2017 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #92):
        sys/arch/arm/allwinner/awin_can.c: revision 1.3
In the RX IRQ handler, release the receive buffer in the error paths.
Fix a hang I've been seeing under high traffic.

diffstat:

 sys/arch/arm/allwinner/awin_can.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 3d98d429b6a7 -r 0c194b355cb7 sys/arch/arm/allwinner/awin_can.c
--- a/sys/arch/arm/allwinner/awin_can.c Wed Jul 05 20:04:40 2017 +0000
+++ b/sys/arch/arm/allwinner/awin_can.c Wed Jul 05 20:06:26 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awin_can.c,v 1.2.2.2 2017/07/02 15:08:29 bouyer Exp $  */
+/*     $NetBSD: awin_can.c,v 1.2.2.3 2017/07/05 20:06:26 snj 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.2.2.2 2017/07/02 15:08:29 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.2.2.3 2017/07/05 20:06:26 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -239,12 +239,14 @@
 
        if (dlc > CAN_MAX_DLC) {
                ifp->if_ierrors++;
+               awin_can_write(sc, AWIN_CAN_CMD_REG, AWIN_CAN_CMD_REL_RX_BUF);
                return;
        }
                
        m = m_gethdr(M_NOWAIT, MT_HEADER);
        if (m == NULL) {
                ifp->if_ierrors++;
+               awin_can_write(sc, AWIN_CAN_CMD_REG, AWIN_CAN_CMD_REL_RX_BUF);
                return;
        }
        cf = mtod(m, struct can_frame *);



Home | Main Index | Thread Index | Old Index