diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/ipv4/tcp_vegas.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'net/ipv4/tcp_vegas.c')
| -rw-r--r-- | net/ipv4/tcp_vegas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c index c6743eec9b7d..80fa2bfd7ede 100644 --- a/net/ipv4/tcp_vegas.c +++ b/net/ipv4/tcp_vegas.c | |||
| @@ -304,7 +304,7 @@ void tcp_vegas_get_info(struct sock *sk, u32 ext, struct sk_buff *skb) | |||
| 304 | } | 304 | } |
| 305 | EXPORT_SYMBOL_GPL(tcp_vegas_get_info); | 305 | EXPORT_SYMBOL_GPL(tcp_vegas_get_info); |
| 306 | 306 | ||
| 307 | static struct tcp_congestion_ops tcp_vegas = { | 307 | static struct tcp_congestion_ops tcp_vegas __read_mostly = { |
| 308 | .flags = TCP_CONG_RTT_STAMP, | 308 | .flags = TCP_CONG_RTT_STAMP, |
| 309 | .init = tcp_vegas_init, | 309 | .init = tcp_vegas_init, |
| 310 | .ssthresh = tcp_reno_ssthresh, | 310 | .ssthresh = tcp_reno_ssthresh, |