diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 00:31:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 00:31:46 -0700 |
| commit | 59a49e38711a146dc0bef4837c825b5422335460 (patch) | |
| tree | 7e6e3d1850159f94e5b05d1c5775bd3cc87c3690 /include/net | |
| parent | 52c1da39534fb382c061de58b65f678ad74b59f5 (diff) | |
| parent | f2d368fa3ef90f2159d9e542303901ebf68144dd (diff) | |
| download | talos-obmc-linux-59a49e38711a146dc0bef4837c825b5422335460.tar.gz talos-obmc-linux-59a49e38711a146dc0bef4837c825b5422335460.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tcp.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index e427cf35915c..ec9e20c27179 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1162,12 +1162,14 @@ extern void tcp_init_congestion_control(struct tcp_sock *tp); extern void tcp_cleanup_congestion_control(struct tcp_sock *tp); extern int tcp_set_default_congestion_control(const char *name); extern void tcp_get_default_congestion_control(char *name); +extern int tcp_set_congestion_control(struct tcp_sock *tp, const char *name); -extern struct tcp_congestion_ops tcp_reno; +extern struct tcp_congestion_ops tcp_init_congestion_ops; extern u32 tcp_reno_ssthresh(struct tcp_sock *tp); extern void tcp_reno_cong_avoid(struct tcp_sock *tp, u32 ack, u32 rtt, u32 in_flight, int flag); extern u32 tcp_reno_min_cwnd(struct tcp_sock *tp); +extern struct tcp_congestion_ops tcp_reno; static inline void tcp_set_ca_state(struct tcp_sock *tp, u8 ca_state) { |
