From: Colin Cross <ccross@android.com>
Date: Tue, 3 May 2011 00:23:45 +0000 (-0700)
Subject: net: Fix "Support nuking IPv6 sockets as well as IPv4" for 2.6.39
X-Git-Tag: 2.1b_release~2620
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf2b99ac31ceca747568eeaf0761c8790a394634;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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 a162a0d..d1e438f 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3326,8 +3326,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);
 }