Re: Compile error in kernel 2.6.10-bk3 in file slhc.c

[mikeb1@t-online.de (Michael Berger)]

Cal Peake wrote:

>On Fri, 31 Dec 2004, Ikke wrote:
>
>  
>
>>Could you point me to the patch please?
>>    
>>
>
>at:
>
>http://linux.bkbits.net:8080/linux-2.5/cset@1.2082?nav=index.html|ChangeSet@-1d
>
>and below.
>
>-- Cal
>
># This is a BitKeeper generated diff -Nru style patch.
>#
># ChangeSet
>#   2004/12/30 15:21:16-08:00 acme@conectiva.com.br 
>#   [PATCH] Fix net/core/sock.o build failure
>#   
>#   This fixes a build failure that happens when you don't select IPV6.
>#   
>#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
># 
># include/linux/ipv6.h
>#   2004/12/29 14:22:45-08:00 acme@conectiva.com.br +1 -1
>#   Fix net/core/sock.o build failure
># 
>diff -Nru a/include/linux/ipv6.h b/include/linux/ipv6.h
>--- a/include/linux/ipv6.h	2004-12-31 03:15:16 -08:00
>+++ b/include/linux/ipv6.h	2004-12-31 03:15:16 -08: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
>
>  
>
Dear Cal

Thank you. I already received the same patch and found it also posted at 
the LKML. Kernel 2.6.10-bk3 is up now for 17+ hours.

Good work LKML

--Michael