diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
commit | b2a878de11251b06be144b5905e37dd0dc0b0104 (patch) | |
tree | f510ac1263ebd939493c3358408325804f7ba6e2 /net/netfilter/nf_conntrack_proto_icmp.c | |
parent | staging: rtl8712: r8712_xmit_classifier(): Change return values and type (diff) | |
parent | Linux 5.3-rc4 (diff) | |
download | linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.tar.xz linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.zip |
Merge 5.3-rc4 into staging-next
We need the iio/staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_icmp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_proto_icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_icmp.c b/net/netfilter/nf_conntrack_proto_icmp.c index dd53e2b20f6b..097deba7441a 100644 --- a/net/netfilter/nf_conntrack_proto_icmp.c +++ b/net/netfilter/nf_conntrack_proto_icmp.c @@ -215,7 +215,7 @@ int nf_conntrack_icmpv4_error(struct nf_conn *tmpl, return -NF_ACCEPT; } - /* See ip_conntrack_proto_tcp.c */ + /* See nf_conntrack_proto_tcp.c */ if (state->net->ct.sysctl_checksum && state->hook == NF_INET_PRE_ROUTING && nf_ip_checksum(skb, state->hook, dataoff, IPPROTO_ICMP)) { |