diff options
| author | Colin Cross <ccross@android.com> | 2011-05-02 17:23:45 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:58 -0700 |
| commit | c473cbb8678058b863333163d7a65f3213893d1d (patch) | |
| tree | 9ed8c7ea97bbada005f107cc86bbecaba7338478 /net/ipv4/tcp.c | |
| parent | b44b7d7ddd4657eb5bc5baf6e081f0a70106bd87 (diff) | |
| download | kernel_samsung_espresso10-c473cbb8678058b863333163d7a65f3213893d1d.tar.gz kernel_samsung_espresso10-c473cbb8678058b863333163d7a65f3213893d1d.tar.bz2 kernel_samsung_espresso10-c473cbb8678058b863333163d7a65f3213893d1d.zip | |
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/ipv4/tcp.c')
| -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 58da8e1e2ae..d99fd5c9190 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3332,8 +3332,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); } |