Merge branch 'upstream-fixes'

[linux-2.6] / include / net / inet_connection_sock.h

diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 91888967d3e3fd59ee49a99837828bf9715e102b..fa587c94e9d0483fc774356b933235cddafcb44c 100644 (file)
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -16,9 +16,10 @@
 #define _INET_CONNECTION_SOCK_H
 
 #include <linux/compiler.h>
-#include <linux/ip.h>
 #include <linux/string.h>
 #include <linux/timer.h>
+
+#include <net/inet_sock.h>
 #include <net/request_sock.h>
 
 #define INET_CSK_DEBUG 1
@@ -82,8 +83,8 @@ struct inet_connection_sock {
        struct timer_list         icsk_delack_timer;
        __u32                     icsk_rto;
        __u32                     icsk_pmtu_cookie;
-       struct tcp_congestion_ops *icsk_ca_ops;
-       struct inet_connection_sock_af_ops *icsk_af_ops;
+       const struct tcp_congestion_ops *icsk_ca_ops;
+       const struct inet_connection_sock_af_ops *icsk_af_ops;
        unsigned int              (*icsk_sync_mss)(struct sock *sk, u32 pmtu);
        __u8                      icsk_ca_state;
        __u8                      icsk_retransmits;