Bug#289974: kernel-source-2.6.10: kernel compilation fails with selinux without ipv6 : patch

[David Coe <davidc@debian.org>]

Package: kernel-source-2.6.10
Version: 2.6.10-3
Severity: normal
Tags: patch


http://www.kernel.org/pub/linux/kernel/v2.6/testing/cset/cset-akpm@osdl.org%5Btorvalds%5D%7CChangeSet%7C20050102174642%7C47485.txt

(also attached) briefly describes and fixes the problem. 
"It works for me."  (Well, it compiles now, at least.)

Thanks.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (600, 'unstable'), (300, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.9zona-06022se
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages kernel-source-2.6.10 depends on:
ii  binutils                      2.15-5     The GNU assembler, linker and bina
ii  bzip2                         1.0.2-3    high-quality block-sorting file co
ii  coreutils [fileutils]         5.2.1-2    The GNU core utilities
ii  fileutils                     5.2.1-2    The GNU file management utilities 

-- no debconf information

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/01/02 09:46:42-08:00 akpm@osdl.org 
#   [PATCH] fix inet6_sk for non IPV6 builds again
#   
#   The recent ipv6 "fix" broke the build:
#   
#   security/selinux/avc.c: In function `avc_audit':
#   security/selinux/avc.c:581: warning: implicit declaration of function `inet6_sk'
#   security/selinux/avc.c:581: warning: initialization makes pointer from integer without a cast
#   
#   Signed-off-by: Andrew Morton <akpm@osdl.org>
#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
# 
# include/linux/ipv6.h
#   2005/01/02 01:37:34-08:00 akpm@osdl.org +11 -0
#   fix inet6_sk for non IPV6 builds again
# 
diff -Nru a/include/linux/ipv6.h b/include/linux/ipv6.h
--- a/include/linux/ipv6.h	2005-01-02 10:13:56 -08:00
+++ b/include/linux/ipv6.h	2005-01-02 10:13:56 -08:00
@@ -289,6 +289,17 @@
 #else
 #define __ipv6_only_sock(sk)	0
 #define ipv6_only_sock(sk)	0
+
+static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)
+{
+	return NULL;
+}
+
+static inline struct raw6_opt * raw6_sk(const struct sock *__sk)
+{
+	return NULL;
+}
+
 #endif
 
 #endif