Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 188cc1ac49eb76ab2c5c806cbb03a406a3c59bf7..12da21afb9ca636bbd438be992cacfa5722b2524 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -19,13 +19,23 @@
 #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
@@ -45,6 +55,8 @@ 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
@@ -55,6 +67,7 @@ static void __exit br_deinit(void)
 
        synchronize_net();
 
+       llc_sap_put(br_stp_sap);
        br_fdb_get_hook = NULL;
        br_fdb_put_hook = NULL;