diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:18:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:18:18 +0800 |
| commit | f5975f15ffe2b02186b5dd388b95fa0ed57a55eb (patch) | |
| tree | 16876a5d6d79138fcee698e6a439d2a4dc92b22e /net/ipv6/sit.c | |
| parent | 96195c7a758055f7c1a77b7070050c12eb949883 (diff) | |
| parent | bd06e78ba67a5ba3c2f8dbf8d0b4a68ddb0fdc05 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-16.07-rt
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 dcccae86190f..ba3d2f3d66d2 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; } |