ipvs: fix build error when CONFIG_IP_VS_IPV6 is disabled

From: Yuanhan Liu <[email protected]>

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 <[email protected]>

Signed-off-by Yuanhan Liu <[email protected]>

Signed-off-by Jesper Dangaard Brouer <[email protected]>

---

include/net/ip_vs.h | 3 ++-

1 files changed, 2 insertions(+), 1 deletions(-)

include/net/ip_vs.h +2 -2

index a681ad6..d930749 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

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!

Quoted 5 lines · Jesper Dangaard Brouer

Hi Pablo,

Argh - there is one more CONFIG option combi that can cause issues.

Quoted 6 lines

*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.