Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...
Simon Horman [Thu, 13 Jan 2011 01:29:21 +0000 (10:29 +0900)]
13 files changed:
1  2 
include/linux/netfilter.h
include/linux/skbuff.h
include/net/netfilter/nf_conntrack.h
net/core/skbuff.c
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/netfilter/core.c
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/ipvs/ip_vs_xmit.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_expect.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_standalone.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge