Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 601c37d61c037198ea4908b94bd394d976617f9a..8f3c58e5f7a562d88abdd9df744bf77fb65663c6 100644 (file)
--- 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;
 
@@ -37,7 +37,9 @@ static int __init br_init(void)
                return -EADDRINUSE;
        }
 
-       br_fdb_init();
+       err = br_fdb_init();
+       if (err)
+               goto err_out;
 
        err = br_netfilter_init();
        if (err)
@@ -63,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;
 }
@@ -72,7 +76,6 @@ static void __exit br_deinit(void)
        rcu_assign_pointer(br_stp_sap->rcv_func, NULL);
 
        br_netlink_fini();
-       br_netfilter_fini();
        unregister_netdevice_notifier(&br_device_notifier);
        brioctl_set(NULL);
 
@@ -80,6 +83,7 @@ static void __exit br_deinit(void)
 
        synchronize_net();
 
+       br_netfilter_fini();
        llc_sap_put(br_stp_sap);
        br_fdb_get_hook = NULL;
        br_fdb_put_hook = NULL;