On Friday, December 31, 2010 01:44:33 Simon Horman wrote: > On Thu, Dec 30, 2010 at 11:50:58AM +0100, hans@xxxxxxxxxxxxxxx wrote: > > From: Hans Schillstrom <hans.schillstrom@xxxxxxxxxxxx> > > > > All global variables moved to struct ipvs, > > most external changes fixed (i.e. init_net removed) > > in sync_buf create + 4 replaced by sizeof(struct..) > > [ snip ] > > > diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c > > index 0454a11..5d6e250 100644 > > --- a/net/netfilter/ipvs/ip_vs_core.c > > +++ b/net/netfilter/ipvs/ip_vs_core.c > > @@ -1477,6 +1477,8 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) > > struct ip_vs_proto_data *pd; > > struct ip_vs_conn *cp; > > int ret, restart, pkts; > > + struct net *net; > > The line above adds a duplicate declaration of net as > just before the diff-context starts there is > > struct net *net = NULL; > I'll remove that -- To unsubscribe from this list: send the line "unsubscribe lvs-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
