diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2004-01-06 05:09:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2004-01-06 05:09:37 -0800 |
| commit | 239f727a99fb0569bdcee5cf0fb9716cd2d457dc (patch) | |
| tree | 6a81d6bec13c16d2f6115a48d72df39d0e5a7da0 /include/linux/ipv6.h | |
| parent | 0c8ad9d059408e60916b8c974e1f20655c2b1810 (diff) | |
| parent | 53b78d22d516fa23f50f250cfaf6057f1824c6bc (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/network-2.6
into nuts.ninka.net:/disk1/davem/BK/net-2.6
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index da2e64899c95..7f5a5c4280f7 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -270,8 +270,15 @@ struct tcp6_sock { struct ipv6_pinfo inet6; }; -#define inet6_sk(__sk) ((struct raw6_sock *)__sk)->pinet6 -#define raw6_sk(__sk) (&((struct raw6_sock *)__sk)->raw6) +static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk) +{ + return ((struct raw6_sock *)__sk)->pinet6; +} + +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) |