summaryrefslogtreecommitdiffstats
path: root/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
diff options
context:
space:
mode:
authorPatrick McHardy2007-07-08 07:28:42 +0200
committerDavid S. Miller2007-07-11 07:17:41 +0200
commit330f7db5e578e1e298ba3a41748e5ea333a64a2b (patch)
tree1557656cf800dcee7915cb41c94d4ce644947c61 /net/ipv4/netfilter/nf_conntrack_proto_icmp.c
parent[NETFILTER]: nf_conntrack: use hlists for conntrack hash (diff)
downloadkernel-qcow2-linux-330f7db5e578e1e298ba3a41748e5ea333a64a2b.tar.gz
kernel-qcow2-linux-330f7db5e578e1e298ba3a41748e5ea333a64a2b.tar.xz
kernel-qcow2-linux-330f7db5e578e1e298ba3a41748e5ea333a64a2b.zip
[NETFILTER]: nf_conntrack: remove 'ignore_conntrack' argument from nf_conntrack_find_get
All callers pass NULL, this also doesn't seem very useful for modules. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/nf_conntrack_proto_icmp.c')
-rw-r--r--net/ipv4/netfilter/nf_conntrack_proto_icmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index f4fc657c1983..91fb277045ef 100644
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -187,13 +187,13 @@ icmp_error_message(struct sk_buff *skb,
*ctinfo = IP_CT_RELATED;
- h = nf_conntrack_find_get(&innertuple, NULL);
+ h = nf_conntrack_find_get(&innertuple);
if (!h) {
/* Locally generated ICMPs will match inverted if they
haven't been SNAT'ed yet */
/* FIXME: NAT code has to handle half-done double NAT --RR */
if (hooknum == NF_IP_LOCAL_OUT)
- h = nf_conntrack_find_get(&origtuple, NULL);
+ h = nf_conntrack_find_get(&origtuple);
if (!h) {
DEBUGP("icmp_error_message: no match\n");