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:
quoted hunk
From: Yuanhan Liu <redacted>
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 <redacted>
Signed-off-by: Yuanhan Liu <redacted>
Signed-off-by: Jesper Dangaard Brouer <redacted>
---
include/net/ip_vs.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
@@ -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
-------------------------------------------------------------------
From: Pablo Neira Ayuso <pablo@netfilter.org> Date: 2012-10-22 16:30:34
On Mon, Oct 22, 2012 at 05:39:43PM +0200, Jesper Dangaard Brouer wrote:
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!
On Mon, 2012-10-22 at 18:30 +0200, Pablo Neira Ayuso wrote:
On Mon, Oct 22, 2012 at 05:39:43PM +0200, Jesper Dangaard Brouer wrote:
quoted
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!
Ok, wait for it.
Posted with subj.:
[nf-next PATCH v2] ipvs: fix build errors related to config option combinations
(Again, I'm very sorry for letting this slip through...)