Skip to content

Commit

Permalink
[NETFILTER]: nf_log: make nf_log_unregister_pf return void
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Feb 12, 2007
1 parent a5ea616 commit 9dc6aa5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/linux/netfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
7 changes: 2 additions & 5 deletions net/netfilter/nf_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 9dc6aa5

Please sign in to comment.