Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index ab0d0efbf240122b6aab244a11d692f716a75bfd..6fcd6a0ade24860807917b746abc5179c6338f6a 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -193,6 +193,19 @@ struct inet6_skb_parm {
 
 #define IP6CB(skb)     ((struct inet6_skb_parm*)((skb)->cb))
 
+struct tcp6_request_sock {
+       struct tcp_request_sock req;
+       struct in6_addr         loc_addr;
+       struct in6_addr         rmt_addr;
+       struct sk_buff          *pktopts;
+       int                     iif;
+};
+
+static inline struct tcp6_request_sock *tcp6_rsk(const struct request_sock *sk)
+{
+       return (struct tcp6_request_sock *)sk;
+}
+
 /**
  * struct ipv6_pinfo - ipv6 private area
  *