Add kbuild.h that contains common definitions for kbuild users

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

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 601c37d61c037198ea4908b94bd394d976617f9a..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)
@@ -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;
 }