aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br.c
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2007-03-22 14:59:03 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:27:14 -0400
commit32fe21c0c0a3091552fea8f2f7e4905f547a3433 (patch)
tree179ec6ee7c2a40d06cab648ff32ade987c81e05c /net/bridge/br.c
parentc127ea2c45d1b13a672fde254679721bb282e90a (diff)
[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 2994387999a8..601c37d61c03 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -47,7 +47,10 @@ static int __init br_init(void)
47 if (err) 47 if (err)
48 goto err_out2; 48 goto err_out2;
49 49
50 br_netlink_init(); 50 err = br_netlink_init();
51 if (err)
52 goto err_out3;
53
51 brioctl_set(br_ioctl_deviceless_stub); 54 brioctl_set(br_ioctl_deviceless_stub);
52 br_handle_frame_hook = br_handle_frame; 55 br_handle_frame_hook = br_handle_frame;
53 56
@@ -55,7 +58,8 @@ static int __init br_init(void)
55 br_fdb_put_hook = br_fdb_put; 58 br_fdb_put_hook = br_fdb_put;
56 59
57 return 0; 60 return 0;
58 61err_out3:
62 unregister_netdevice_notifier(&br_device_notifier);
59err_out2: 63err_out2:
60 br_netfilter_fini(); 64 br_netfilter_fini();
61err_out1: 65err_out1: