diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-07 02:31:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-07 02:31:18 -0800 |
| commit | e32c91c0019ec6e2a706de712ed16b9d96f4e203 (patch) | |
| tree | f739d47ddb1ccfff8a525a7ef4b79ef82cdacef7 /include/linux/ipv6.h | |
| parent | b9575611ae5c8f422367ee0f46f1547ccf650c2c (diff) | |
| parent | d5991ced12962a31a7f4354a8e23fd13823a8639 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
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) |