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>

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 58da8e1e2aeef2a387d64c48600f4dd99239c904..d99fd5c91903ed9ff5f36a85c07ff201a3e9182d 100644 (file)
--- 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);
 }