summaryrefslogtreecommitdiff
path: root/net/bridge/br.c
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2007-03-22 11:59:03 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:27:14 -0700
commit32fe21c0c0a3091552fea8f2f7e4905f547a3433 (patch)
tree179ec6ee7c2a40d06cab648ff32ade987c81e05c /net/bridge/br.c
parentc127ea2c45d1b13a672fde254679721bb282e90a (diff)
downloadlinux-3.10-32fe21c0c0a3091552fea8f2f7e4905f547a3433.tar.gz
linux-3.10-32fe21c0c0a3091552fea8f2f7e4905f547a3433.tar.bz2
linux-3.10-32fe21c0c0a3091552fea8f2f7e4905f547a3433.zip
[BRIDGE]: Use rtnl registration interface
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br.c')
-rw-r--r--net/bridge/br.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c
index 2994387999a..601c37d61c0 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -47,7 +47,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,7 +58,8 @@ 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: