[src/netbsd-3]: src/sys/net Pull up revision 1.9 (requested by bouyer in tick...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5199a42973f
branches:  netbsd-3
changeset: 576172:b5199a42973f
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Jun 10 15:52:56 2005 +0000

description:
Pull up revision 1.9 (requested by bouyer in ticket #438):
call (ifp->if_input) at splnet(). ifp->if_input points to ether_input()
which doesn't raise the IPL itself in all cases.
Should also fix PR 29546 (the pkgsrc kernel module needs to be updated).

diffstat:

 sys/net/if_tap.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 8bd9d4997935 -r b5199a42973f sys/net/if_tap.c
--- a/sys/net/if_tap.c  Fri Jun 10 15:45:24 2005 +0000
+++ b/sys/net/if_tap.c  Fri Jun 10 15:52:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tap.c,v 1.6 2005/02/26 22:45:09 perry Exp $ */
+/*     $NetBSD: if_tap.c,v 1.6.2.1 2005/06/10 15:52:56 tron Exp $      */
 
 /*
  *  Copyright (c) 2003, 2004 The NetBSD Foundation.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.6 2005/02/26 22:45:09 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.6.2.1 2005/06/10 15:52:56 tron Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "bpfilter.h"
@@ -919,6 +919,7 @@
        struct ifnet *ifp;
        struct mbuf *m, **mp;
        int error = 0;
+       int s;
 
        if (sc == NULL)
                return (ENXIO);
@@ -959,7 +960,9 @@
        if (ifp->if_bpf)
                bpf_mtap(ifp->if_bpf, m);
 #endif
+       s =splnet();
        (*ifp->if_input)(ifp, m);
+       splx(s);
 
        return (0);
 }