diff options
| author | David S. Miller | 2019-07-09 04:48:57 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-07-09 04:48:57 +0200 |
| commit | af144a983402f7fd324ce556d9f9011a8b3e01fe (patch) | |
| tree | 7a0250b960a36976bc683789d9fe86b9f60a97a5 /net/netfilter/nf_nat_proto.c | |
| parent | skbuff: increase verbosity when dumping skb data (diff) | |
| parent | tcp: Reset bytes_acked and bytes_received when disconnecting (diff) | |
| download | kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.gz kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.xz kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_nat_proto.c')
| -rw-r--r-- | net/netfilter/nf_nat_proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_nat_proto.c b/net/netfilter/nf_nat_proto.c index 888292e8fbb2..7ac733ebd060 100644 --- a/net/netfilter/nf_nat_proto.c +++ b/net/netfilter/nf_nat_proto.c @@ -564,7 +564,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb, if (skb_ensure_writable(skb, hdrlen + sizeof(*inside))) return 0; - if (nf_ip_checksum(skb, hooknum, hdrlen, 0)) + if (nf_ip_checksum(skb, hooknum, hdrlen, IPPROTO_ICMP)) return 0; inside = (void *)skb->data + hdrlen; |