---

yaml --- r: 26950 b: refs/heads/master c: 387e2b0 h: refs/heads/master v: v3
git-mirror · May 23, 2006 · 6c44f3a · 6c44f3a
1 parent 56e57d5
commit 6c44f3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a063739138e2c4e933188d641f1593e01ce8285
+refs/heads/master: 387e2b0439026aa738a9edca15a57e5c0bcb4dfc
diff --git a/trunk/net/bridge/br.c b/trunk/net/bridge/br.c
@@ -55,7 +55,7 @@ static int __init br_init(void)
 
 static void __exit br_deinit(void)
 {
-	llc_sap_close(br_stp_sap);
+	rcu_assign_pointer(br_stp_sap->rcv_func, NULL);
 
 #ifdef CONFIG_BRIDGE_NETFILTER
 	br_netfilter_fini();
@@ -67,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;