The nf_log_unregister_pf() function is not used anymore as it was corresponding to the unbind operation which is now done via nflog_unbind_pf(). Signed-off-by: Eric Leblond <eric@xxxxxx> --- include/net/netfilter/nf_log.h | 1 - net/netfilter/nf_log.c | 15 --------------- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/include/net/netfilter/nf_log.h b/include/net/netfilter/nf_log.h index 08b4f18..ccaa43a 100644 --- a/include/net/netfilter/nf_log.h +++ b/include/net/netfilter/nf_log.h @@ -48,7 +48,6 @@ struct nf_logger { /* Function to register/unregister log function. */ int nf_log_register(u_int8_t pf, struct nf_logger *logger); void nf_log_unregister(struct nf_logger *logger); -void nf_log_unregister_pf(u_int8_t pf); int nf_log_bind_pf(u_int8_t pf, const struct nf_logger *logger); int nf_log_unbind_pf(u_int8_t pf); diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 8a5e4aa..a1dcd46 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -69,21 +69,6 @@ int nf_log_register(u_int8_t pf, struct nf_logger *logger) } EXPORT_SYMBOL(nf_log_register); -void nf_log_unregister_pf(u_int8_t pf) -{ - struct nf_logger *e; - if (pf >= ARRAY_SIZE(nf_loggers)) - return; - spin_lock_bh(&nf_log_lock); - list_for_each_entry(e, &(nf_loggers_l[pf]), list[pf]) - list_del(&(e->list[pf])); - spin_unlock_bh(&nf_log_lock); - - /* Give time to concurrent readers. */ - synchronize_rcu(); -} -EXPORT_SYMBOL(nf_log_unregister_pf); - void nf_log_unregister(struct nf_logger *logger) { int i; -- 1.6.1 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html