diff options
| author | Colin Cross <ccross@android.com> | 2011-12-02 13:52:46 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-12-02 13:52:46 +0800 |
| commit | 9c615383102fda5800fc7a4219e0c8b094001417 (patch) | |
| tree | ccaf32124ebc2842e6bc1fdc1821f30069620a85 /net | |
| parent | b6f282d84bbc9cc8931b919099e69bc6c0959344 (diff) | |
net: Fix "Support nuking IPv6 sockets as well as IPv4" for
2.6.39
Change-Id: I247b8dc2e32bb83e731209928600e92892dd042c
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 953316169b1..11c8930752c 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3321,8 +3321,9 @@ void __init tcp_init(void) static int tcp_is_local(struct net *net, __be32 addr) { struct rtable *rt; - struct flowi fl = { .nl_u = { .ip4_u = { .daddr = addr } } }; - if (ip_route_output_key(net, &rt, &fl) || !rt) + struct flowi4 fl4 = { .daddr = addr }; + rt = ip_route_output_key(net, &fl4); + if (!rt) return 0; return rt->dst.dev && (rt->dst.dev->flags & IFF_LOOPBACK); } |