Merge branch 'master' into upstream-fixes

[mv-sheeva.git] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 558d27204f60c32c9ce0a69bdb379dde58e3dc8d..2994387999a846bc1673095a173484404b4fdafc 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -13,7 +13,6 @@
  *     2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
@@ -48,6 +47,7 @@ static int __init br_init(void)
        if (err)
                goto err_out2;
 
+       br_netlink_init();
        brioctl_set(br_ioctl_deviceless_stub);
        br_handle_frame_hook = br_handle_frame;
 
@@ -67,6 +67,7 @@ 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);