diff options
author | Patrick McHardy <kaber@trash.net> | 2007-02-12 19:11:24 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-02-12 19:11:24 (GMT) |
commit | 9dc6aa5fcfc104becd86c89c5e7ec90e840e0163 (patch) | |
tree | 4e6d22cd7fdcae42cbccd7ef71b86958ac5ac736 | |
parent | a5ea6169f294bc33a762f7c1c240e3ac0f045f9e (diff) | |
download | linux-fsl-qoriq-9dc6aa5fcfc104becd86c89c5e7ec90e840e0163.tar.xz |
[NETFILTER]: nf_log: make nf_log_unregister_pf return void
Since the only user of nf_log_unregister_pf (nfnetlink_log) doesn't
check the return value, change it to void and bail out silently when
a non-existant address family is supplied.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/netfilter.h | 2 | ||||
-rw-r--r-- | net/netfilter/nf_log.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index d4c4c51..18a6790 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -172,7 +172,7 @@ struct nf_logger { /* Function to register/unregister log function. */ int nf_log_register(int pf, struct nf_logger *logger); -int nf_log_unregister_pf(int pf); +void nf_log_unregister_pf(int pf); void nf_log_unregister_logger(struct nf_logger *logger); /* Calls the registered backend logging function */ diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index a3ff88d..814bab7 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -40,19 +40,16 @@ int nf_log_register(int pf, struct nf_logger *logger) } EXPORT_SYMBOL(nf_log_register); -int nf_log_unregister_pf(int pf) +void nf_log_unregister_pf(int pf) { if (pf >= NPROTO) - return -EINVAL; - + return; spin_lock(&nf_log_lock); rcu_assign_pointer(nf_logging[pf], NULL); spin_unlock(&nf_log_lock); /* Give time to concurrent readers. */ synchronize_rcu(); - - return 0; } EXPORT_SYMBOL(nf_log_unregister_pf); |