Re: [2.6-bk] net/core/sock.o build failed

[Arnaldo Carvalho de Melo]

RamÃn Rey Vicente wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> CC      net/core/sock.o
> In file included from include/net/ipv6.h:18,
> ~                 from include/net/xfrm.h:16,
> ~                 from net/core/sock.c:121:
> include/linux/ipv6.h: In function `inet6_sk':
> include/linux/ipv6.h:278: error: structure has no member named `pinet6'
> make[2]: *** [net/core/sock.o] Error 1
> make[1]: *** [net/core] Error 2
> make: *** [net] Error

Use the attached patch, this was already sent to David Miller, as I mentioned
in another message, this only happens when you don't select IPV6.

Regards,

- Arnaldo
===== include/linux/ipv6.h 1.23 vs edited =====
--- 1.23/include/linux/ipv6.h	2004-12-27 23:56:33 -02:00
+++ edited/include/linux/ipv6.h	2004-12-29 20:22:45 -02:00
@@ -273,6 +273,7 @@
 	struct ipv6_pinfo inet6;
 };
 
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)
 {
 	return inet_sk(__sk)->pinet6;
@@ -283,7 +284,6 @@
 	return &((struct raw6_sock *)__sk)->raw6;
 }
 
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 #define __ipv6_only_sock(sk)	(inet6_sk(sk)->ipv6only)
 #define ipv6_only_sock(sk)	((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))
 #else