diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /include/linux/ipv6.h | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index ab0d0efbf240..6fcd6a0ade24 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -193,6 +193,19 @@ struct inet6_skb_parm { | |||
| 193 | 193 | ||
| 194 | #define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb)) | 194 | #define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb)) |
| 195 | 195 | ||
| 196 | struct tcp6_request_sock { | ||
| 197 | struct tcp_request_sock req; | ||
| 198 | struct in6_addr loc_addr; | ||
| 199 | struct in6_addr rmt_addr; | ||
| 200 | struct sk_buff *pktopts; | ||
| 201 | int iif; | ||
| 202 | }; | ||
| 203 | |||
| 204 | static inline struct tcp6_request_sock *tcp6_rsk(const struct request_sock *sk) | ||
| 205 | { | ||
| 206 | return (struct tcp6_request_sock *)sk; | ||
| 207 | } | ||
| 208 | |||
| 196 | /** | 209 | /** |
| 197 | * struct ipv6_pinfo - ipv6 private area | 210 | * struct ipv6_pinfo - ipv6 private area |
| 198 | * | 211 | * |