[nf-next PATCH] ipvs: fix build error when CONFIG_IP_VS_IPV6 is disabled

To: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>, Simon Horman <horms@xxxxxxxxxxxx>
Subject: [nf-next PATCH] ipvs: fix build error when CONFIG_IP_VS_IPV6 is disabled
Cc: Jesper Dangaard Brouer <brouer@xxxxxxxxxx>, fengguang.wu@xxxxxxxxx, yuanhan.liu@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, lvs-devel@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx
From: Jesper Dangaard Brouer <brouer@xxxxxxxxxx>
Date: Mon, 22 Oct 2012 14:17:11 +0200
From: Yuanhan Liu <yuanhan.liu@xxxxxxxxxxxxxxx>

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 <fengguang.wu@xxxxxxxxx>
Signed-off-by: Yuanhan Liu <yuanhan.liu@xxxxxxxxxxxxxxx>
Signed-off-by: Jesper Dangaard Brouer <brouer@xxxxxxxxxx>

 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
+       {
                const struct iphdr *iph =
                        (struct iphdr *)skb_network_header(skb);
                iphdr->saddr.ip = iph->saddr;

To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at

<Prev in Thread] Current Thread [Next in Thread>