summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/netfilter.h2
-rw-r--r--net/netfilter/nf_log.c7
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);
OpenPOWER on IntegriCloud