Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git...

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

diff --git a/include/linux/ip.h b/include/linux/ip.h
index d5b7c907204efa2d004d2b7bd5f8521646d36157..33e8a19a1a0fbaec33122f4f931c3d577fc975c9 100644 (file)
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -109,7 +109,7 @@ struct ip_options {
 #define optlength(opt) (sizeof(struct ip_options) + opt->optlen)
 
 struct inet_request_sock {
-       struct open_request     req;
+       struct request_sock     req;
        u32                     loc_addr;
        u32                     rmt_addr;
        u16                     rmt_port;
@@ -123,7 +123,7 @@ struct inet_request_sock {
        struct ip_options       *opt;
 };
 
-static inline struct inet_request_sock *inet_rsk(const struct open_request *sk)
+static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)
 {
        return (struct inet_request_sock *)sk;
 }
@@ -196,6 +196,8 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,
 #endif
 #endif
 
+extern int inet_sk_rebuild_header(struct sock *sk);
+
 struct iphdr {
 #if defined(__LITTLE_ENDIAN_BITFIELD)
        __u8    ihl:4,