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 | |
| 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')
| -rw-r--r-- | net/ipv4/tcp.c | 5 | ||||
| -rw-r--r-- | net/ipv6/ip6_vti.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 27a10c3a547c..13c1b51defe3 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3141,7 +3141,7 @@ static int tcp_is_local(struct net *net, __be32 addr) { return rt->dst.dev && (rt->dst.dev->flags & IFF_LOOPBACK); } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if defined(CONFIG_IPV6) static int tcp_is_local6(struct net *net, struct in6_addr *addr) { struct rt6_info *rt6 = rt6_lookup(net, addr, addr, 0, 0); return rt6 && rt6->dst.dev && (rt6->dst.dev->flags & IFF_LOOPBACK); @@ -3209,7 +3209,7 @@ restart: continue; } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if defined(CONFIG_IPV6) if (family == AF_INET6) { struct in6_addr *s6; if (!inet->pinet6) @@ -3246,3 +3246,4 @@ restart: return 0; } +EXPORT_SYMBOL_GPL(tcp_nuke_addr); 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; |