summaryrefslogtreecommitdiffstats
path: root/include/net/inet_connection_sock.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 13:44:43 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 13:44:43 -0800
commit58dc125a66145f45f239cd78db9410062dc0bcd4 (patch)
tree90537ddf035e96ca3182f61755ed234de93b449b /include/net/inet_connection_sock.h
parentc544bdb1999e04eb10035f1c3262a103859d94b2 (diff)
parent8a4c8a96a47c9e2f08156fd9664974df086eed50 (diff)
downloadtalos-op-linux-58dc125a66145f45f239cd78db9410062dc0bcd4.tar.gz
talos-op-linux-58dc125a66145f45f239cd78db9410062dc0bcd4.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/inet_connection_sock.h')
-rw-r--r--include/net/inet_connection_sock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 50234fa56a68..fa587c94e9d0 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -83,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;
OpenPOWER on IntegriCloud