CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Mon Mar 28 04:38:04 UTC 2016

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

Log Message:
Remove unused global bridge list

Pointed out by riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 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.110 src/sys/net/if_bridge.c:1.111
--- src/sys/net/if_bridge.c:1.110	Wed Mar 23 05:44:01 2016
+++ src/sys/net/if_bridge.c	Mon Mar 28 04:38:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bridge.c,v 1.110 2016/03/23 05:44:01 ozaki-r Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.111 2016/03/28 04:38:04 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.110 2016/03/23 05:44:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.111 2016/03/28 04:38:04 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
@@ -341,9 +341,6 @@ static const struct bridge_control bridg
 
 static const int bridge_control_table_size = __arraycount(bridge_control_table);
 
-static LIST_HEAD(, bridge_softc) bridge_list;
-static kmutex_t bridge_list_lock;
-
 static struct if_clone bridge_cloner =
     IF_CLONE_INITIALIZER("bridge", bridge_clone_create, bridge_clone_destroy);
 
@@ -359,8 +356,6 @@ bridgeattach(int n)
 	pool_init(&bridge_rtnode_pool, sizeof(struct bridge_rtnode),
 	    0, 0, 0, "brtpl", NULL, IPL_NET);
 
-	LIST_INIT(&bridge_list);
-	mutex_init(&bridge_list_lock, MUTEX_DEFAULT, IPL_NET);
 	if_clone_attach(&bridge_cloner);
 }
 
@@ -432,10 +427,6 @@ bridge_clone_create(struct if_clone *ifc
 
 	if_alloc_sadl(ifp);
 
-	mutex_enter(&bridge_list_lock);
-	LIST_INSERT_HEAD(&bridge_list, sc, sc_list);
-	mutex_exit(&bridge_list_lock);
-
 	return (0);
 }
 
@@ -460,10 +451,6 @@ bridge_clone_destroy(struct ifnet *ifp)
 		bridge_delete_member(sc, bif);
 	BRIDGE_UNLOCK(sc);
 
-	mutex_enter(&bridge_list_lock);
-	LIST_REMOVE(sc, sc_list);
-	mutex_exit(&bridge_list_lock);
-
 	splx(s);
 
 	if_detach(ifp);