CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Thu Mar  9 04:37:23 UTC 2017

Modified Files:
        src/sys/net: bridgestp.c

Log Message:
Remove unnecessary splnet


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/net/bridgestp.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/net/bridgestp.c
diff -u src/sys/net/bridgestp.c:1.23 src/sys/net/bridgestp.c:1.24
--- src/sys/net/bridgestp.c:1.23	Fri Jun 10 13:27:15 2016
+++ src/sys/net/bridgestp.c	Thu Mar  9 04:37:23 2017
@@ -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 (ja...@thought.net)
@@ -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 @@ bstp_send_config_bpdu(struct bridge_soft
 	struct mbuf *m;
 	struct ether_header *eh;
 	struct bstp_cbpdu bpdu;
-	int s;
 
 	KASSERT(BRIDGE_LOCKED(sc));
 
@@ -277,9 +276,7 @@ bstp_send_config_bpdu(struct bridge_soft
 	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 @@ bstp_transmit_tcn(struct bridge_softc *s
 	struct ifnet *ifp;
 	struct ether_header *eh;
 	struct mbuf *m;
-	int s;
 
 	KASSERT(BRIDGE_LOCKED(sc));
 
@@ -397,9 +393,7 @@ bstp_transmit_tcn(struct bridge_softc *s
 	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 @@ bstp_tick(void *arg)
 {
 	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 @@ bstp_tick(void *arg)
 		callout_reset(&sc->sc_bstpcallout, hz, bstp_tick, sc);
 
 	BRIDGE_UNLOCK(sc);
-	splx(s);
 }
 
 static void