X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=net%2Fbridge%2Fbr.c;h=188cc1ac49eb76ab2c5c806cbb03a406a3c59bf7;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=12da21afb9ca636bbd438be992cacfa5722b2524;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 12da21afb..188cc1ac4 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -19,23 +19,13 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/llc.h>
-#include <net/llc.h>
 
 #include "br_private.h"
 
 int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
 
-static struct llc_sap *br_stp_sap;
-
 static int __init br_init(void)
 {
-	br_stp_sap = llc_sap_open(LLC_SAP_BSPAN, br_stp_rcv);
-	if (!br_stp_sap) {
-		printk(KERN_ERR "bridge: can't register sap for STP\n");
-		return -EBUSY;
-	}
-
 	br_fdb_init();
 
 #ifdef CONFIG_BRIDGE_NETFILTER
@@ -55,8 +45,6 @@ static int __init br_init(void)
 
 static void __exit br_deinit(void)
 {
-	rcu_assign_pointer(br_stp_sap->rcv_func, NULL);
-
 #ifdef CONFIG_BRIDGE_NETFILTER
 	br_netfilter_fini();
 #endif
@@ -67,7 +55,6 @@ static void __exit br_deinit(void)
 
 	synchronize_net();
 
-	llc_sap_put(br_stp_sap);
 	br_fdb_get_hook = NULL;
 	br_fdb_put_hook = NULL;