From: Eric W Biederman <ebiederm@xxxxxxxxxxxx> Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> --- net/netfilter/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 95456c09cf69..1b4eadc9c030 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -134,7 +134,9 @@ void nf_unregister_hook(struct net *net, const struct nf_hook_ops *reg) #ifdef HAVE_JUMP_LABEL static_key_slow_dec(&nf_hooks_needed[reg->pf][reg->hooknum]); #endif - synchronize_net(); + /* Don't wait if there are no packets in flight */ + if (net->loopback_dev) + synchronize_net(); kfree(elem); } EXPORT_SYMBOL(nf_unregister_hook); -- 2.2.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
