summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-01-01 17:46:42 -0800
committerLinus Torvalds <torvalds@evo.osdl.org>2005-01-01 17:46:42 -0800
commitd1c7de4e09488123c8fdf71b05e9a2383ca32d27 (patch)
tree7a7b36da6e737ba331fc0b7224f6e4af480e2a40 /include
parent8e441db5e59dba7e2e2aff1573ea10ce24748801 (diff)
[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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ipv6.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c99f73e36521..f042ae186520 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -289,6 +289,17 @@ static inline struct raw6_opt * raw6_sk(const struct sock *__sk)
#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