diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-12-18 15:09:38 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-12-18 15:09:38 +0530 |
| commit | 4d4899cc6c5f3572bdca0486a123f42d19261603 (patch) | |
| tree | d4b9187ce1830eba4d5782168af1989b84943777 /net/ipv6/sit.c | |
| parent | 8466c55d9fbc79c97cfe36a376f10d4805868399 (diff) | |
| parent | 4231b6a98fceb1589f13e886c26130d2fd4e3901 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.106-hikey
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 184f0fe35dc6..b7ea5eaa4fd1 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1093,6 +1093,7 @@ static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p) ipip6_tunnel_link(sitn, t); t->parms.iph.ttl = p->iph.ttl; t->parms.iph.tos = p->iph.tos; + t->parms.iph.frag_off = p->iph.frag_off; if (t->parms.link != p->link) { t->parms.link = p->link; ipip6_tunnel_bind_dev(t->dev); |