aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c2
-rw-r--r--net/ipv4/netfilter/nf_conntrack_proto_icmp.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 129a8cccf4a1..a103f597d446 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -334,7 +334,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)
334 return -EINVAL; 334 return -EINVAL;
335 } 335 }
336 336
337 h = nf_conntrack_find_get(&tuple, NULL); 337 h = nf_conntrack_find_get(&tuple);
338 if (h) { 338 if (h) {
339 struct sockaddr_in sin; 339 struct sockaddr_in sin;
340 struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h); 340 struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h);
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,
187 187
188 *ctinfo = IP_CT_RELATED; 188 *ctinfo = IP_CT_RELATED;
189 189
190 h = nf_conntrack_find_get(&innertuple, NULL); 190 h = nf_conntrack_find_get(&innertuple);
191 if (!h) { 191 if (!h) {
192 /* Locally generated ICMPs will match inverted if they 192 /* Locally generated ICMPs will match inverted if they
193 haven't been SNAT'ed yet */ 193 haven't been SNAT'ed yet */
194 /* FIXME: NAT code has to handle half-done double NAT --RR */ 194 /* FIXME: NAT code has to handle half-done double NAT --RR */
195 if (hooknum == NF_IP_LOCAL_OUT) 195 if (hooknum == NF_IP_LOCAL_OUT)
196 h = nf_conntrack_find_get(&origtuple, NULL); 196 h = nf_conntrack_find_get(&origtuple);
197 197
198 if (!h) { 198 if (!h) {
199 DEBUGP("icmp_error_message: no match\n"); 199 DEBUGP("icmp_error_message: no match\n");