diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 17:27:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 17:27:47 +0200 |
| commit | 9e7f7f5425e6d1492109a537ee88c99b29580655 (patch) | |
| tree | 81f9d68abb5b793aadaf80bd6940af04e3c16eb9 /net/ipv6/sit.c | |
| parent | 6daa2ec0b3e3808c55329d12de3c157cf38b17b0 (diff) | |
| parent | f80fd3a5fff88a9ace7e8cd11d07cf874a63ea9f (diff) | |
| download | linux-9e7f7f5425e6d1492109a537ee88c99b29580655.tar.bz2 | |
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 0a5a255277e5..0619ac70836d 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -560,13 +560,13 @@ static int ipip6_err(struct sk_buff *skb, u32 info) if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { ipv4_update_pmtu(skb, dev_net(skb->dev), info, - t->parms.link, 0, IPPROTO_IPV6, 0); + t->parms.link, 0, iph->protocol, 0); err = 0; goto out; } if (type == ICMP_REDIRECT) { ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0, - IPPROTO_IPV6, 0); + iph->protocol, 0); err = 0; goto out; } |