CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Sun Jun 15 16:10:46 UTC 2014

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

Log Message:
Get rid of unnecessary splnet for pool_{get,put}

A mutex prevents interrupts in the functions now.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/net/if_bridge.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/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.77 src/sys/net/if_bridge.c:1.78
--- src/sys/net/if_bridge.c:1.77	Sat Jun 29 21:06:58 2013
+++ src/sys/net/if_bridge.c	Sun Jun 15 16:10:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bridge.c,v 1.77 2013/06/29 21:06:58 rmind Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.78 2014/06/15 16:10:46 ozaki-r Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.77 2013/06/29 21:06:58 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.78 2014/06/15 16:10:46 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
@@ -1647,7 +1647,7 @@ bridge_rtupdate(struct bridge_softc *sc,
     struct ifnet *dst_if, int setflags, uint8_t flags)
 {
 	struct bridge_rtnode *brt;
-	int error, s;
+	int error;
 
 	/*
 	 * A route for this destination might already exist.  If so,
@@ -1662,9 +1662,7 @@ bridge_rtupdate(struct bridge_softc *sc,
 		 * initialize the expiration time and Ethernet
 		 * address.
 		 */
-		s = splnet();
 		brt = pool_get(&bridge_rtnode_pool, PR_NOWAIT);
-		splx(s);
 		if (brt == NULL)
 			return (ENOMEM);
 
@@ -1674,9 +1672,7 @@ bridge_rtupdate(struct bridge_softc *sc,
 		memcpy(brt->brt_addr, dst, ETHER_ADDR_LEN);
 
 		if ((error = bridge_rtnode_insert(sc, brt)) != 0) {
-			s = splnet();
 			pool_put(&bridge_rtnode_pool, brt);
-			splx(s);
 			return (error);
 		}
 	}