From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesper Dangaard Brouer Subject: Re: [nf-next PATCH] ipvs: fix build error when CONFIG_IP_VS_IPV6 is disabled Date: Mon, 22 Oct 2012 17:39:43 +0200 (CEST) Message-ID: References: <20121022121711.31397.6231.stgit@dragon> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Pablo Neira Ayuso , Simon Horman , fengguang.wu@intel.com, yuanhan.liu@linux.intel.com, netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org To: Jesper Dangaard Brouer Return-path: In-Reply-To: <20121022121711.31397.6231.stgit@dragon> Sender: netfilter-devel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Hi Pablo, Argh - there is one more CONFIG option combi that can cause issues. *So hold off on this patch* Which is related to including linux/netfilter_ipv6/ip6_tables.h under CONFIG_IPV6 when CONFIG_NETFILTER is disabled, as kernel/sysctl_binary.c include net/ip_vs.h. I'll send a new patch soon! --Jesper On Mon, 22 Oct 2012, Jesper Dangaard Brouer wrote: > From: Yuanhan Liu > > Fix build error introduced by commit 63dca2c0: > "ipvs: Fix faulty IPv6 extension header handling in IPVS" > > The build error only occur, when CONFIG_IP_VS_IPV6 is disabled. > > Reported-by: Fengguang Wu > Signed-off-by: Yuanhan Liu > Signed-off-by: Jesper Dangaard Brouer > --- > > include/net/ip_vs.h | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h > index a681ad6..d930749 100644 > --- a/include/net/ip_vs.h > +++ b/include/net/ip_vs.h > @@ -212,8 +212,9 @@ ip_vs_fill_iph_addr_only(int af, const struct sk_buff *skb, > (struct ipv6hdr *)skb_network_header(skb); > iphdr->saddr.in6 = iph->saddr; > iphdr->daddr.in6 = iph->daddr; > - } else { > + } else > #endif > + { > const struct iphdr *iph = > (struct iphdr *)skb_network_header(skb); > iphdr->saddr.ip = iph->saddr; > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Hilsen Jesper Brouer -- ------------------------------------------------------------------- MSc. Master of Computer Science Dept. of Computer Science, University of Copenhagen Author of http://www.adsl-optimizer.dk -------------------------------------------------------------------