diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-12-14 16:19:29 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-12-14 16:19:29 -0800 |
commit | 9fc740e49155dd8d77a7a51f8657825e9aa29826 (patch) | |
tree | cc9acae5accb9bb49e2b9c2b77af1c0e90f3223e /net/ipv6/ip6_vti.c | |
parent | c579c69130742ae8cd6a41cd6c04462dd70c27e1 (diff) | |
parent | d231cdfa7c3440c5b1afa13c3343b06898a0d587 (diff) |
Merge branch 'linux-linaro-lsk-v4.1-android' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v4.1-androidlsk-v4.1-15.12-android
Diffstat (limited to 'net/ipv6/ip6_vti.c')
-rw-r--r-- | net/ipv6/ip6_vti.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 0224c032dca5..0dbba59e8817 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -599,7 +599,7 @@ static int vti6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (type == NDISC_REDIRECT) ip6_redirect(skb, net, skb->dev->ifindex, 0); else - ip6_update_pmtu(skb, net, info, 0, 0); + ip6_update_pmtu(skb, net, info, 0, 0, INVALID_UID); xfrm_state_put(x); return 0; |