sparc: types: use <asm-generic/int-*.h> for the sparc architecture

[linux-2.6-omap-h63xx.git] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 93867bb6cc978ca76c07c6de8bb31f55b0e8dc79..8f3c58e5f7a562d88abdd9df744bf77fb65663c6 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -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;
 }
@@ -74,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);
 
@@ -82,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;