diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2004-12-29 23:21:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-29 23:21:16 -0800 |
| commit | bffac3b3f1c99d1b607eb3749eb338f0c3da7e22 (patch) | |
| tree | 928f65a746850097a82faa9e53ba9fdf1222d57f /include/linux | |
| parent | 3025be72b01b8ee0bbd36e0722104a74446d9d8e (diff) | |
[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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index d7c28b9db4fd..c99f73e36521 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -273,6 +273,7 @@ struct tcp6_sock { 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 @@ static inline struct raw6_opt * raw6_sk(const struct sock *__sk) 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 |