diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-28 17:41:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:07 -0500 |
commit | b7c6ba6eb1234e35a74fb8ba8123232a7b1ba9e4 (patch) | |
tree | 672c08c95229a6ac242ab12a5195dceddb0f3127 /net/bridge | |
parent | 4f84d82f7a623f8641af2574425c329431ff158f (diff) |
[NETNS]: Consolidate kernel netlink socket destruction.
Create a specific helper for netlink kernel socket disposal. This just
let the code look better and provides a ground for proper disposal
inside a namespace.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Tested-by: Alexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebt_ulog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index b73ba28bcbe8..8e7b00b68d38 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c | |||
@@ -307,7 +307,7 @@ static int __init ebt_ulog_init(void) | |||
307 | if (!ebtulognl) | 307 | if (!ebtulognl) |
308 | ret = -ENOMEM; | 308 | ret = -ENOMEM; |
309 | else if ((ret = ebt_register_watcher(&ulog))) | 309 | else if ((ret = ebt_register_watcher(&ulog))) |
310 | sock_release(ebtulognl->sk_socket); | 310 | netlink_kernel_release(ebtulognl); |
311 | 311 | ||
312 | if (ret == 0) | 312 | if (ret == 0) |
313 | nf_log_register(PF_BRIDGE, &ebt_ulog_logger); | 313 | nf_log_register(PF_BRIDGE, &ebt_ulog_logger); |
@@ -333,7 +333,7 @@ static void __exit ebt_ulog_fini(void) | |||
333 | } | 333 | } |
334 | spin_unlock_bh(&ub->lock); | 334 | spin_unlock_bh(&ub->lock); |
335 | } | 335 | } |
336 | sock_release(ebtulognl->sk_socket); | 336 | netlink_kernel_release(ebtulognl); |
337 | } | 337 | } |
338 | 338 | ||
339 | module_init(ebt_ulog_init); | 339 | module_init(ebt_ulog_init); |