Re: linux-next: Tree for March 27 (netfilter build error)

[Cyrill Gorcunov <gorcunov@gmail.com>]

[David Miller - Fri, Mar 27, 2009 at 04:01:07PM -0700]
| From: Randy Dunlap <randy.dunlap@oracle.com>
| Date: Fri, 27 Mar 2009 09:48:40 -0700
| 
| > Stephen Rothwell wrote:
| > > Hi all,
| > > 
| > > Changes since 20090326:
| > 
| > 
| > with CONFIG_IPV6=n:
| > 
| > ERROR: "__ipv6_addr_type" [net/netfilter/xt_cluster.ko] undefined!
| > 
| > config attached.
| 
| Patrick and netfilter folks, please have a look, thanks!
| 

Pablo, seems like something as inlined below is
missed? (except I doubt about CONFIG_IPV6_MODULE
here)

        Cyrill
---
 net/netfilter/xt_cluster.c |    2 ++
 1 file changed, 2 insertions(+)

Index: linux-2.6.git/net/netfilter/xt_cluster.c
===================================================================
--- linux-2.6.git.orig/net/netfilter/xt_cluster.c
+++ linux-2.6.git/net/netfilter/xt_cluster.c
@@ -67,8 +67,10 @@ xt_cluster_is_multicast_addr(const struc
 		is_multicast = ipv4_is_multicast(ip_hdr(skb)->daddr);
 		break;
 	case NFPROTO_IPV6:
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 		is_multicast = ipv6_addr_type(&ipv6_hdr(skb)->daddr) &
 						IPV6_ADDR_MULTICAST;
+#endif
 		break;
 	default:
 		WARN_ON(1);