From 021b44706f4706715965ed05ac456a3cd818d4fb Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 22 Aug 2006 00:32:05 -0700 Subject: [PATCH] --- yaml --- r: 34523 b: refs/heads/master c: b3a27bfba51d445784eb0cd6451b73a73fb69cf9 h: refs/heads/master i: 34521: 94894db194e010bb937787f807926645cd537542 34519: 20fd19261862efb0e43a4306dd0822ea59f2091e v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_netlink.c | 3 +++ trunk/net/netfilter/nf_conntrack_netlink.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bd5e9cb79d51..05011e4b0e03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9a37e0c81c498be2db9f52063c53e55d76c815e +refs/heads/master: b3a27bfba51d445784eb0cd6451b73a73fb69cf9 diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c index 38708e6cfae7..ef84f43f0734 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c @@ -1257,6 +1257,9 @@ static int ctnetlink_expect_event(struct notifier_block *this, } else return NOTIFY_DONE; + if (!nfnetlink_has_listeners(NFNLGRP_CONNTRACK_EXP_NEW)) + return NOTIFY_DONE; + skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC); if (!skb) return NOTIFY_DONE; diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c index aa0148f418a9..dc4f081dca91 100644 --- a/trunk/net/netfilter/nf_conntrack_netlink.c +++ b/trunk/net/netfilter/nf_conntrack_netlink.c @@ -1278,6 +1278,9 @@ static int ctnetlink_expect_event(struct notifier_block *this, } else return NOTIFY_DONE; + if (!nfnetlink_has_listeners(NFNLGRP_CONNTRACK_EXP_NEW)) + return NOTIFY_DONE; + skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC); if (!skb) return NOTIFY_DONE;