OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bridge: fix IPV6=n build 

Fix bridge netfilter code so that it uses CONFIG_IPV6 as needed:

net/built-in.o: In function `ebt_filter_ip6':
ebt_ip6.c:(.text+0x87c37): undefined reference to `ipv6_skip_exthdr'
net/built-in.o: In function `ebt_log_packet':
ebt_log.c:(.text+0x88dee): undefined reference to `ipv6_skip_exthdr'
make[1]: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Randy Dunlap 2008-06-17 16:16:13 -07:00 committed by David S. Miller
parent 92c0574f11
commit f586287e0f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/bridge/netfilter/Kconfig
View File

@ -85,7 +85,7 @@ config BRIDGE_EBT_IP
config BRIDGE_EBT_IP6 config BRIDGE_EBT_IP6
tristate "ebt: IP6 filter support" tristate "ebt: IP6 filter support"
depends on BRIDGE_NF_EBTABLES depends on BRIDGE_NF_EBTABLES && IPV6
help help
This option adds the IP6 match, which allows basic IPV6 header field This option adds the IP6 match, which allows basic IPV6 header field
filtering. filtering.

2
net/bridge/netfilter/Makefile
View File

@ -14,7 +14,7 @@ obj-$(CONFIG_BRIDGE_EBT_802_3) += ebt_802_3.o
obj-$(CONFIG_BRIDGE_EBT_AMONG) += ebt_among.o obj-$(CONFIG_BRIDGE_EBT_AMONG) += ebt_among.o
obj-$(CONFIG_BRIDGE_EBT_ARP) += ebt_arp.o obj-$(CONFIG_BRIDGE_EBT_ARP) += ebt_arp.o
obj-$(CONFIG_BRIDGE_EBT_IP) += ebt_ip.o obj-$(CONFIG_BRIDGE_EBT_IP) += ebt_ip.o
obj-$(CONFIG_BRIDGE_EBT_IP) += ebt_ip6.o obj-$(CONFIG_BRIDGE_EBT_IP6) += ebt_ip6.o
obj-$(CONFIG_BRIDGE_EBT_LIMIT) += ebt_limit.o obj-$(CONFIG_BRIDGE_EBT_LIMIT) += ebt_limit.o
obj-$(CONFIG_BRIDGE_EBT_MARK) += ebt_mark_m.o obj-$(CONFIG_BRIDGE_EBT_MARK) += ebt_mark_m.o
obj-$(CONFIG_BRIDGE_EBT_PKTTYPE) += ebt_pkttype.o obj-$(CONFIG_BRIDGE_EBT_PKTTYPE) += ebt_pkttype.o

2
net/bridge/netfilter/ebt_log.c
View File

@ -123,6 +123,7 @@ ebt_log_packet(unsigned int pf, unsigned int hooknum,
goto out; goto out;
} }
#if defined(CONFIG_BRIDGE_EBT_IP6) || defined(CONFIG_BRIDGE_EBT_IP6_MODULE)
if ((bitmask & EBT_LOG_IP6) && eth_hdr(skb)->h_proto == if ((bitmask & EBT_LOG_IP6) && eth_hdr(skb)->h_proto ==
htons(ETH_P_IPV6)) { htons(ETH_P_IPV6)) {
const struct ipv6hdr *ih; const struct ipv6hdr *ih;
@ -146,6 +147,7 @@ ebt_log_packet(unsigned int pf, unsigned int hooknum,
print_ports(skb, nexthdr, offset_ph); print_ports(skb, nexthdr, offset_ph);
goto out; goto out;
} }
#endif
if ((bitmask & EBT_LOG_ARP) && if ((bitmask & EBT_LOG_ARP) &&
((eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) || ((eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) ||