diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-09-28 23:35:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-09-28 23:35:18 -0700 |
| commit | f755f1fb2f560682a6792ba70e32943476e721e1 (patch) | |
| tree | 925f553716b0219907a170d6d1e9bf1a9de5f6f1 /include/linux | |
| parent | 723fc4b6971ef24cf05d09c14849e647990caffd (diff) | |
| parent | 6cf96e1cc2fc0e9a5f32c9c78f9a5559923192fa (diff) | |
Merge nuts.davemloft.net:/disk1/BK/acme-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ipv6.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 55aba976aba6..d7d1673880d5 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -182,8 +182,7 @@ enum { as offsets from skb->nh. */ -struct inet6_skb_parm -{ +struct inet6_skb_parm { int iif; __u16 ra; __u16 hop; @@ -194,6 +193,14 @@ struct inet6_skb_parm #define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb)) +/** + * struct ipv6_pinfo - ipv6 private area + * + * In the struct sock hierarchy (tcp6_sock, upd6_sock, etc) + * this _must_ be the last member, so that inet6_sk_generic + * is able to calculate its offset from the base struct sock + * by using the struct proto->slab_obj_size member. -acme + */ struct ipv6_pinfo { struct in6_addr saddr; struct in6_addr rcv_saddr; @@ -282,10 +289,6 @@ static inline struct raw6_opt * raw6_sk(const struct sock *__sk) return &((struct raw6_sock *)__sk)->raw6; } -struct ipv6_sk_offset { - int offset; -}; - #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)) |