Driver Core: add kobj_attribute handling

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

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 2994387999a846bc1673095a173484404b4fdafc..a9018287312071c4cd77a442b062b7444c7b72bf 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)
@@ -47,7 +49,10 @@ static int __init br_init(void)
        if (err)
                goto err_out2;
 
-       br_netlink_init();
+       err = br_netlink_init();
+       if (err)
+               goto err_out3;
+
        brioctl_set(br_ioctl_deviceless_stub);
        br_handle_frame_hook = br_handle_frame;
 
@@ -55,10 +60,13 @@ static int __init br_init(void)
        br_fdb_put_hook = br_fdb_put;
 
        return 0;
-
+err_out3:
+       unregister_netdevice_notifier(&br_device_notifier);
 err_out2:
        br_netfilter_fini();
 err_out1:
+       br_fdb_fini();
+err_out:
        llc_sap_put(br_stp_sap);
        return err;
 }