* [PATCH -next] bridge: fix IPV6=n build
@ 2008-06-17 16:42 Randy Dunlap
2008-06-17 23:16 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2008-06-17 16:42 UTC (permalink / raw)
To: netdev, shemminger; +Cc: linux-next, davem
From: Randy Dunlap <randy.dunlap@oracle•com>
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>
---
net/bridge/netfilter/Kconfig | 2 +-
net/bridge/netfilter/Makefile | 2 +-
net/bridge/netfilter/ebt_log.c | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
--- linux-next-20080617.orig/net/bridge/netfilter/Kconfig
+++ linux-next-20080617/net/bridge/netfilter/Kconfig
@@ -85,7 +85,7 @@ config BRIDGE_EBT_IP
config BRIDGE_EBT_IP6
tristate "ebt: IP6 filter support"
- depends on BRIDGE_NF_EBTABLES
+ depends on BRIDGE_NF_EBTABLES && IPV6
help
This option adds the IP6 match, which allows basic IPV6 header field
filtering.
--- linux-next-20080617.orig/net/bridge/netfilter/Makefile
+++ linux-next-20080617/net/bridge/netfilter/Makefile
@@ -14,7 +14,7 @@ obj-$(CONFIG_BRIDGE_EBT_802_3) += ebt_80
obj-$(CONFIG_BRIDGE_EBT_AMONG) += ebt_among.o
obj-$(CONFIG_BRIDGE_EBT_ARP) += ebt_arp.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_MARK) += ebt_mark_m.o
obj-$(CONFIG_BRIDGE_EBT_PKTTYPE) += ebt_pkttype.o
--- linux-next-20080617.orig/net/bridge/netfilter/ebt_log.c
+++ linux-next-20080617/net/bridge/netfilter/ebt_log.c
@@ -123,6 +123,7 @@ ebt_log_packet(unsigned int pf, unsigned
goto out;
}
+#if defined(CONFIG_BRIDGE_EBT_IP6) || defined(CONFIG_BRIDGE_EBT_IP6_MODULE)
if ((bitmask & EBT_LOG_IP6) && eth_hdr(skb)->h_proto ==
htons(ETH_P_IPV6)) {
const struct ipv6hdr *ih;
@@ -146,6 +147,7 @@ ebt_log_packet(unsigned int pf, unsigned
print_ports(skb, nexthdr, offset_ph);
goto out;
}
+#endif
if ((bitmask & EBT_LOG_ARP) &&
((eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) ||
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -next] bridge: fix IPV6=n build
2008-06-17 16:42 [PATCH -next] bridge: fix IPV6=n build Randy Dunlap
@ 2008-06-17 23:16 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-06-17 23:16 UTC (permalink / raw)
To: randy.dunlap; +Cc: netdev, shemminger, linux-next
From: Randy Dunlap <randy.dunlap@oracle•com>
Date: Tue, 17 Jun 2008 09:42:14 -0700
> 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>
Applied, thanks Randy.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-06-17 23:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-17 16:42 [PATCH -next] bridge: fix IPV6=n build Randy Dunlap
2008-06-17 23:16 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox