summaryrefslogtreecommitdiffstats
path: root/kernel/tracepoint.c
diff options
context:
space:
mode:
authorJesper Dangaard Brouer <brouer@redhat.com>2012-10-22 21:22:45 +0200
committerSimon Horman <horms@verge.net.au>2012-10-23 09:23:40 +0900
commit54d83efa44aac87983f973abb42c508a25a2b554 (patch)
tree25496f5736c6b08d49682376396c41b745d1ac0f /kernel/tracepoint.c
parentbcc58c4d9141160d6448e4589acbd46e5c647518 (diff)
downloadtalos-obmc-linux-54d83efa44aac87983f973abb42c508a25a2b554.tar.gz
talos-obmc-linux-54d83efa44aac87983f973abb42c508a25a2b554.zip
ipvs: fix build errors related to config option combinations
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>
Diffstat (limited to 'kernel/tracepoint.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud