Source-Changes-HG archive

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

[src/trunk]: src/sys/net Remove unnecessary splnet



details:   https://anonhg.NetBSD.org/src/rev/f7ed27da5933
branches:  trunk
changeset: 822238:f7ed27da5933
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Mar 09 04:37:23 2017 +0000

description:
Remove unnecessary splnet

diffstat:

 sys/net/bridgestp.c |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (72 lines):

diff -r 5eb1d7a8926c -r f7ed27da5933 sys/net/bridgestp.c
--- a/sys/net/bridgestp.c       Thu Mar 09 00:43:50 2017 +0000
+++ b/sys/net/bridgestp.c       Thu Mar 09 04:37:23 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bridgestp.c,v 1.23 2016/06/10 13:27:15 ozaki-r Exp $   */
+/*     $NetBSD: bridgestp.c,v 1.24 2017/03/09 04:37:23 ozaki-r Exp $   */
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason%thought.net@localhost)
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bridgestp.c,v 1.23 2016/06/10 13:27:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bridgestp.c,v 1.24 2017/03/09 04:37:23 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -219,7 +219,6 @@
        struct mbuf *m;
        struct ether_header *eh;
        struct bstp_cbpdu bpdu;
-       int s;
 
        KASSERT(BRIDGE_LOCKED(sc));
 
@@ -277,9 +276,7 @@
        memcpy(mtod(m, char *) + sizeof(*eh), &bpdu, sizeof(bpdu));
 
        BRIDGE_UNLOCK(sc);
-       s = splnet();
        bridge_enqueue(sc, ifp, m, 0);
-       splx(s);
        BRIDGE_LOCK(sc);
 }
 
@@ -365,7 +362,6 @@
        struct ifnet *ifp;
        struct ether_header *eh;
        struct mbuf *m;
-       int s;
 
        KASSERT(BRIDGE_LOCKED(sc));
 
@@ -397,9 +393,7 @@
        memcpy(mtod(m, char *) + sizeof(*eh), &bpdu, sizeof(bpdu));
 
        BRIDGE_UNLOCK(sc);
-       s = splnet();
        bridge_enqueue(sc, ifp, m, 0);
-       splx(s);
        BRIDGE_LOCK(sc);
 }
 
@@ -1062,9 +1056,7 @@
 {
        struct bridge_softc *sc = arg;
        struct bridge_iflist *bif;
-       int s;
 
-       s = splnet();
        BRIDGE_LOCK(sc);
 
        BRIDGE_IFLIST_WRITER_FOREACH(bif, sc) {
@@ -1114,7 +1106,6 @@
                callout_reset(&sc->sc_bstpcallout, hz, bstp_tick, sc);
 
        BRIDGE_UNLOCK(sc);
-       splx(s);
 }
 
 static void



Home | Main Index | Thread Index | Old Index