netdev
[Top] [All Lists]

[IPV6] fix inet6_sk for non IPV6 builds

To: "David S. Miller" <davem@xxxxxxxxxxxxx>
Subject: [IPV6] fix inet6_sk for non IPV6 builds
From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx>
Date: Wed, 29 Dec 2004 20:32:15 -0200
Cc: Networking Team <netdev@xxxxxxxxxxx>, James.Bottomley@xxxxxxxxxxxxxxxxxxxxx
Organization: Conectiva S.A.
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mozilla Thunderbird 0.9 (X11/20041103)
Hi David,

        Please apply this patch, the problem was noted by James Bottomley, that
doesn't enables CONFIG_IPV6.

Signed-off-by: Arnaldo Carvalho de Melo

- Arnaldo
===== include/linux/ipv6.h 1.23 vs edited =====
--- 1.23/include/linux/ipv6.h   2004-12-27 23:56:33 -02:00
+++ edited/include/linux/ipv6.h 2004-12-29 20:22:45 -02: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
<Prev in Thread] Current Thread [Next in Thread>