From 1a0a82ae313a703e934fe1b45c5cbf624cd9615e Mon Sep 17 00:00:00 2001
From: Jesper Dangaard Brouer <brouer@redhat.com>
Date: Mon, 22 Oct 2012 21:22:45 +0200
Subject: [PATCH] --- yaml --- r: 340507 b: refs/heads/master c:
 54d83efa44aac87983f973abb42c508a25a2b554 h: refs/heads/master i:   340505:
 f8a45d3e26834e300329a88759a7d1bfa8c967bf   340503:
 ca20e36358e5aff9b04fc7dd5dad91d34bce82d2 v: v3

---
 [refs]                    | 2 +-
 trunk/include/net/ip_vs.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9b24e4bdd44a..349075a11e5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcc58c4d9141160d6448e4589acbd46e5c647518
+refs/heads/master: 54d83efa44aac87983f973abb42c508a25a2b554
diff --git a/trunk/include/net/ip_vs.h b/trunk/include/net/ip_vs.h
index a681ad65b735..68c69d54d392 100644
--- a/trunk/include/net/ip_vs.h
+++ b/trunk/include/net/ip_vs.h
@@ -22,7 +22,7 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>			/* for struct ipv6hdr */
 #include <net/ipv6.h>
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_IP_VS_IPV6)
 #include <linux/netfilter_ipv6/ip6_tables.h>
 #endif
 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
@@ -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;