include/linux/ipv6.h error?
inet_sk(__sk) returns pointer to inet_sock structure which has pinet6 field defined or not defined depending on kernel configuration during compilation time
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
struct ipv6_pinfo *pinet6;#endif
the function below causes compilation error in kernel configs with neither CONFIG_IPV6 nor CONFIG_IPV6_MODULE defined.
should these functions be included between
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)
{
return inet_sk(__sk)->pinet6;
}static inline struct raw6_opt * raw6_sk(const struct sock *__sk)
{
return &((struct raw6_sock *)__sk)->raw6;
}#endif
?? or should the #ifdef directive be removed from ipv6.h header file?
regards
-mb
Quoted 18 lines · Mateusz Berezecki
inet_sk(__sk)returns pointer toinet_sockstructure which has pinet6 field defined or not defined depending on kernel configuration during compilation time#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) struct ipv6_pinfo *pinet6;#endif
the function below causes compilation error in kernel configs with neither
CONFIG_IPV6norCONFIG_IPV6_MODULEdefined.should these functions be included between
#ifdefined(CONFIG_IPV6)||defined(CONFIG_IPV6_MODULE)static inline struct
ipv6_pinfo*inet6_sk(const struct sock *__sk){ return inet_sk(__sk)->pinet6; }
Quoted 8 lines
static inline struct
raw6_opt*raw6_sk(const struct sock *__sk){ return &((struct raw6_sock *)__sk)->raw6; }#endif
?? or should the #ifdef directive be removed from
ipv6.hheader file?
My fault, sorry... James Bottomley already pointed this out to me and I already sent a fix to David Miller, CCed to netdev, here for convenience. It only happens when you don't select IPV6.
I kindly suggest that such reports, related to networking development, at least be CCed to [email protected].
- Arnaldo
===== include/linux/ipv6.h 1.23 vs edited =====
include/linux/ipv6.h +1 -1
@@ -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