From: Simon Horman <horms@verge.net.au>
Date: Thu, 13 Jan 2011 01:29:21 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net... 
X-Git-Tag: MMI-PSA29.97-13-9~20520^2~510^2~14^2~26
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fee1cc0895fd7bde875a86bbc3a1e82089e540b8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of git://git./linux/kernel/git/davem/net-next-2.6 into HEAD
---

fee1cc0895fd7bde875a86bbc3a1e82089e540b8
diff --cc net/netfilter/ipvs/ip_vs_xmit.c
index fb2a445ddc59,5325a3fbe4ac..1f2a4e35fb11
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@@ -178,16 -170,12 +170,11 @@@ __ip_vs_reroute_locally(struct sk_buff 
  		refdst_drop(orefdst);
  	} else {
  		struct flowi fl = {
- 			.oif = 0,
- 			.nl_u = {
- 				.ip4_u = {
- 					.daddr = iph->daddr,
- 					.saddr = iph->saddr,
- 					.tos = RT_TOS(iph->tos),
- 				}
- 			},
+ 			.fl4_dst = iph->daddr,
+ 			.fl4_src = iph->saddr,
+ 			.fl4_tos = RT_TOS(iph->tos),
  			.mark = skb->mark,
  		};
 -		struct rtable *rt;
  
  		if (ip_route_output_key(net, &rt, &fl))
  			return 0;