Commit d1c7de4e authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8e441db5
...@@ -289,6 +289,17 @@ static inline struct raw6_opt * raw6_sk(const struct sock *__sk) ...@@ -289,6 +289,17 @@ static inline struct raw6_opt * raw6_sk(const struct sock *__sk)
#else #else
#define __ipv6_only_sock(sk) 0 #define __ipv6_only_sock(sk) 0
#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
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment