[src/trunk]: src/sys/net As ether_input() is always called at IPL_NET, there ...

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

details:   https://anonhg.NetBSD.org/src/rev/7f92934726cd
branches:  trunk
changeset: 581921:7f92934726cd
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Fri Jun 10 11:11:38 2005 +0000

description:
As ether_input() is always called at IPL_NET, there is no need to
protect the IF_* operations with splnet()/splx().

diffstat:

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

diffs (54 lines):

diff -r f717370310cb -r 7f92934726cd sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Fri Jun 10 10:28:17 2005 +0000
+++ b/sys/net/if_ethersubr.c    Fri Jun 10 11:11:38 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.125 2005/05/29 21:22:52 christos Exp $      */
+/*     $NetBSD: if_ethersubr.c,v 1.126 2005/06/10 11:11:38 bouyer Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.125 2005/05/29 21:22:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.126 2005/06/10 11:11:38 bouyer Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -653,7 +653,6 @@
        struct ethercom *ec = (struct ethercom *) ifp;
        struct ifqueue *inq;
        u_int16_t etype;
-       int s;
        struct ether_header *eh;
 #if defined (ISO) || defined (LLC) || defined(NETATALK)
        struct llc *l;
@@ -822,13 +821,11 @@
                        inq = &ppoediscinq;
                else
                        inq = &ppoeinq;
-               s = splnet();
                if (IF_QFULL(inq)) {
                        IF_DROP(inq);
                        m_freem(m);
                } else
                        IF_ENQUEUE(inq, m);
-               splx(s);
 #ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
                if (!callout_pending(&pppoe_softintr))
                        callout_reset(&pppoe_softintr, 1, pppoe_softintr_handler, NULL);
@@ -1078,13 +1075,11 @@
 #endif /* ISO || LLC || NETATALK*/
        }
 
-       s = splnet();
        if (IF_QFULL(inq)) {
                IF_DROP(inq);
                m_freem(m);
        } else
                IF_ENQUEUE(inq, m);
-       splx(s);
 }
 
 /*