CVS commit: src/sys/dev/ic

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Fri Jan 22 06:51:47 UTC 2016

Modified Files:
        src/sys/dev/ic: midway.c

Log Message:
Revert previous

atm_input is not compatible with ifp->if_input and other *_input routines...


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/ic/midway.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/dev/ic/midway.c
diff -u src/sys/dev/ic/midway.c:1.95 src/sys/dev/ic/midway.c:1.96
--- src/sys/dev/ic/midway.c:1.95	Fri Jan 22 06:34:59 2016
+++ src/sys/dev/ic/midway.c	Fri Jan 22 06:51:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: midway.c,v 1.95 2016/01/22 06:34:59 ozaki-r Exp $	*/
+/*	$NetBSD: midway.c,v 1.96 2016/01/22 06:51:47 ozaki-r Exp $	*/
 /*	(sync'd to midway.c 1.68)	*/
 
 /*
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.95 2016/01/22 06:34:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.96 2016/01/22 06:51:47 ozaki-r Exp $");
 
 #include "opt_natm.h"
 
@@ -2768,7 +2768,7 @@ EN_INTR_TYPE en_intr(void *arg)
 
 	  bpf_mtap(ifp, m);
 
-	  ifp->if_input(ifp, &ah, m, sc->rxslot[slot].rxhand);
+	  atm_input(ifp, &ah, m, sc->rxslot[slot].rxhand);
 	}
 
       }