netdev - [nf-next PATCH] ipvs: fix build error when CONFIG_IP_VS

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20121022121711.31397.6231.stgit@dragon>
Date:	Mon, 22 Oct 2012 14:17:11 +0200
From:	Jesper Dangaard Brouer <brouer@...hat.com>
To:	Pablo Neira Ayuso <pablo@...filter.org>,
	Simon Horman <horms@...ge.net.au>
Cc:	Jesper Dangaard Brouer <brouer@...hat.com>, fengguang.wu@...el.com,
	yuanhan.liu@...ux.intel.com, netdev@...r.kernel.org,
	lvs-devel@...r.kernel.org, netfilter-devel@...r.kernel.org
Subject: [nf-next PATCH] ipvs: fix build error when CONFIG_IP_VS_IPV6 is
	disabled

From: Yuanhan Liu <yuanhan.liu@...ux.intel.com>

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@...el.com>
Signed-off-by: Yuanhan Liu <yuanhan.liu@...ux.intel.com>
Signed-off-by: Jesper Dangaard Brouer <brouer@...hat.com>
---

 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html