From 9dc6aa5fcfc104becd86c89c5e7ec90e840e0163 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 12 Feb 2007 11:11:24 -0800 Subject: [PATCH] [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 Signed-off-by: David S. Miller --- include/linux/netfilter.h | 2 +- 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 d4c4c5120b..18a67908a3 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 a3ff88dcc2..814bab700d 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); -- 2.39.5