diff options
author | Patrick McHardy <kaber@trash.net> | 2007-02-12 14:11:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-02-12 14:11:24 -0500 |
commit | 9dc6aa5fcfc104becd86c89c5e7ec90e840e0163 (patch) | |
tree | 4e6d22cd7fdcae42cbccd7ef71b86958ac5ac736 /net | |
parent | a5ea6169f294bc33a762f7c1c240e3ac0f045f9e (diff) |
[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>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/nf_log.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index a3ff88dcc2ac..814bab700db6 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) | |||
40 | } | 40 | } |
41 | EXPORT_SYMBOL(nf_log_register); | 41 | EXPORT_SYMBOL(nf_log_register); |
42 | 42 | ||
43 | int nf_log_unregister_pf(int pf) | 43 | void nf_log_unregister_pf(int pf) |
44 | { | 44 | { |
45 | if (pf >= NPROTO) | 45 | if (pf >= NPROTO) |
46 | return -EINVAL; | 46 | return; |
47 | |||
48 | spin_lock(&nf_log_lock); | 47 | spin_lock(&nf_log_lock); |
49 | rcu_assign_pointer(nf_logging[pf], NULL); | 48 | rcu_assign_pointer(nf_logging[pf], NULL); |
50 | spin_unlock(&nf_log_lock); | 49 | spin_unlock(&nf_log_lock); |
51 | 50 | ||
52 | /* Give time to concurrent readers. */ | 51 | /* Give time to concurrent readers. */ |
53 | synchronize_rcu(); | 52 | synchronize_rcu(); |
54 | |||
55 | return 0; | ||
56 | } | 53 | } |
57 | EXPORT_SYMBOL(nf_log_unregister_pf); | 54 | EXPORT_SYMBOL(nf_log_unregister_pf); |
58 | 55 | ||