diff options
author | Patrick McHardy <kaber@trash.net> | 2007-02-12 14:11:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-02-12 14:11:55 -0500 |
commit | e92ad99c78de09a5ba0746e1c0ee27cc7450c64d (patch) | |
tree | 6ed2fcfbfdd88738fcf90dc5d25274246dcee07d /net/bridge | |
parent | 9b73534dc57fa2fd5ef567586adb83c16e88a52f (diff) |
[NETFILTER]: nf_log: minor cleanups
- rename nf_logging to nf_loggers since its an array of registered loggers
- rename nf_log_unregister_logger() to nf_log_unregister() to make it
symetrical to nf_log_register() and convert all users
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebt_log.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_ulog.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index f9a5ae9d5b6d..45712aec6a0e 100644 --- a/net/bridge/netfilter/ebt_log.c +++ b/net/bridge/netfilter/ebt_log.c | |||
@@ -208,7 +208,7 @@ static int __init ebt_log_init(void) | |||
208 | 208 | ||
209 | static void __exit ebt_log_fini(void) | 209 | static void __exit ebt_log_fini(void) |
210 | { | 210 | { |
211 | nf_log_unregister_logger(&ebt_log_logger); | 211 | nf_log_unregister(&ebt_log_logger); |
212 | ebt_unregister_watcher(&log); | 212 | ebt_unregister_watcher(&log); |
213 | } | 213 | } |
214 | 214 | ||
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index 2e4cb24e191a..8e15cc47f6c0 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c | |||
@@ -323,7 +323,7 @@ static void __exit ebt_ulog_fini(void) | |||
323 | ebt_ulog_buff_t *ub; | 323 | ebt_ulog_buff_t *ub; |
324 | int i; | 324 | int i; |
325 | 325 | ||
326 | nf_log_unregister_logger(&ebt_ulog_logger); | 326 | nf_log_unregister(&ebt_ulog_logger); |
327 | ebt_unregister_watcher(&ulog); | 327 | ebt_unregister_watcher(&ulog); |
328 | for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) { | 328 | for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) { |
329 | ub = &ulog_buffers[i]; | 329 | ub = &ulog_buffers[i]; |