diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-07-22 14:00:50 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-07-22 14:00:50 +0930 |
| commit | 48be0c57f9c5f5c197fba129924709660a23a4a0 (patch) | |
| tree | 4601cbecb454dfab02631248b7bb8eb5d239c165 /net/ipv6/sit.c | |
| parent | b951233aa15e85d43aed2421e0adac1a2abc5770 (diff) | |
| parent | 35467dc7630af60abacc330f64029d081f160530 (diff) | |
| download | talos-obmc-linux-48be0c57f9c5f5c197fba129924709660a23a4a0.tar.gz talos-obmc-linux-48be0c57f9c5f5c197fba129924709660a23a4a0.zip | |
Merge tag 'v4.4.15' into dev-4.4
This is the 4.4.15 stable release
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; } |
