diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:44:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:44:43 -0500 |
| commit | 58dc125a66145f45f239cd78db9410062dc0bcd4 (patch) | |
| tree | 90537ddf035e96ca3182f61755ed234de93b449b /include/net | |
| parent | c544bdb1999e04eb10035f1c3262a103859d94b2 (diff) | |
| parent | 8a4c8a96a47c9e2f08156fd9664974df086eed50 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/inet_connection_sock.h | 4 |
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 { | |||
| 83 | struct timer_list icsk_delack_timer; | 83 | struct timer_list icsk_delack_timer; |
| 84 | __u32 icsk_rto; | 84 | __u32 icsk_rto; |
| 85 | __u32 icsk_pmtu_cookie; | 85 | __u32 icsk_pmtu_cookie; |
| 86 | struct tcp_congestion_ops *icsk_ca_ops; | 86 | const struct tcp_congestion_ops *icsk_ca_ops; |
| 87 | struct inet_connection_sock_af_ops *icsk_af_ops; | 87 | const struct inet_connection_sock_af_ops *icsk_af_ops; |
| 88 | unsigned int (*icsk_sync_mss)(struct sock *sk, u32 pmtu); | 88 | unsigned int (*icsk_sync_mss)(struct sock *sk, u32 pmtu); |
| 89 | __u8 icsk_ca_state; | 89 | __u8 icsk_ca_state; |
| 90 | __u8 icsk_retransmits; | 90 | __u8 icsk_retransmits; |