* [GIT PULL nf-next] IPVS for 3.8
@ 2012-10-23 0:50 Simon Horman
2012-10-23 0:50 ` [PATCH] ipvs: fix build errors related to config option combinations Simon Horman
2012-10-23 8:49 ` [GIT PULL nf-next] IPVS for 3.8 Pablo Neira Ayuso
0 siblings, 2 replies; 3+ messages in thread
From: Simon Horman @ 2012-10-23 0:50 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Hans Schillstrom, Hans Schillstrom,
Jesper Dangaard Brouer, Fengguang Wu, Yuanhan Liu
Hi Pablo,
please consider the following build fix from Jesper for 3.8.
----------------------------------------------------------------
The following changes since commit bcc58c4d9141160d6448e4589acbd46e5c647518:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next (2012-10-22 12:30:41 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git master
for you to fetch changes up to 54d83efa44aac87983f973abb42c508a25a2b554:
ipvs: fix build errors related to config option combinations (2012-10-23 09:23:40 +0900)
----------------------------------------------------------------
Jesper Dangaard Brouer (1):
ipvs: fix build errors related to config option combinations
include/net/ip_vs.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] ipvs: fix build errors related to config option combinations
2012-10-23 0:50 [GIT PULL nf-next] IPVS for 3.8 Simon Horman
@ 2012-10-23 0:50 ` Simon Horman
2012-10-23 8:49 ` [GIT PULL nf-next] IPVS for 3.8 Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2012-10-23 0:50 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Hans Schillstrom, Hans Schillstrom,
Jesper Dangaard Brouer, Fengguang Wu, Yuanhan Liu, Simon Horman
From: Jesper Dangaard Brouer <brouer@redhat.com>
Fix two build error introduced by commit 63dca2c0:
"ipvs: Fix faulty IPv6 extension header handling in IPVS"
First build error was fairly trivial and can occur, when
CONFIG_IP_VS_IPV6 is disabled.
The second build error was tricky, and can occur when deselecting
both all Netfilter and IPVS, but selecting CONFIG_IPV6. This is
caused by "kernel/sysctl_binary.c" including "net/ip_vs.h", which
includes "linux/netfilter_ipv6/ip6_tables.h" causing include
of "include/linux/netfilter/x_tables.h" which then cannot find
the typedef nf_hookfn.
Fix this by only including "linux/netfilter_ipv6/ip6_tables.h" in
case of CONFIG_IP_VS_IPV6 as its already used to guard the usage
of ipv6_find_hdr().
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Reported-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
include/net/ip_vs.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index a681ad6..68c69d5 100644
--- a/include/net/ip_vs.h
+++ b/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;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [GIT PULL nf-next] IPVS for 3.8
2012-10-23 0:50 [GIT PULL nf-next] IPVS for 3.8 Simon Horman
2012-10-23 0:50 ` [PATCH] ipvs: fix build errors related to config option combinations Simon Horman
@ 2012-10-23 8:49 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2012-10-23 8:49 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Hans Schillstrom, Hans Schillstrom,
Jesper Dangaard Brouer, Fengguang Wu, Yuanhan Liu
On Tue, Oct 23, 2012 at 09:50:50AM +0900, Simon Horman wrote:
> Hi Pablo,
>
> please consider the following build fix from Jesper for 3.8.
>
> ----------------------------------------------------------------
> The following changes since commit bcc58c4d9141160d6448e4589acbd46e5c647518:
>
> Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next (2012-10-22 12:30:41 +0200)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git master
Pulled, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-23 8:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-23 0:50 [GIT PULL nf-next] IPVS for 3.8 Simon Horman
2012-10-23 0:50 ` [PATCH] ipvs: fix build errors related to config option combinations Simon Horman
2012-10-23 8:49 ` [GIT PULL nf-next] IPVS for 3.8 Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).