X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fbridge%2Fbr.c;h=a9018287312071c4cd77a442b062b7444c7b72bf;hb=37487a56523d402e25650da16c337acf4cecd13d;hp=848b8fa8bedd23ee09048ec87e096fc505b6fcb7;hpb=49e1900d4cc2e7bcecb681fe60f0990bec2dcce8;p=linux-2.6-omap-h63xx.git

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 848b8fa8bed..a9018287312 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -23,7 +23,7 @@
 
 #include "br_private.h"
 
-int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
+int (*br_should_route_hook)(struct sk_buff *skb);
 
 static struct llc_sap *br_stp_sap;
 
@@ -39,7 +39,7 @@ static int __init br_init(void)
 
 	err = br_fdb_init();
 	if (err)
-		goto err_out1;
+		goto err_out;
 
 	err = br_netfilter_init();
 	if (err)
@@ -65,6 +65,8 @@ err_out3:
 err_out2:
 	br_netfilter_fini();
 err_out1:
+	br_fdb_fini();
+err_out:
 	llc_sap_put(br_stp_sap);
 	return err;
 }