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_scalable.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_scalable.c')
| -rw-r--r-- | net/ipv4/tcp_scalable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_scalable.c b/net/ipv4/tcp_scalable.c index a76513779e2b..8ce55b8aaec8 100644 --- a/net/ipv4/tcp_scalable.c +++ b/net/ipv4/tcp_scalable.c | |||
| @@ -35,7 +35,7 @@ static u32 tcp_scalable_ssthresh(struct sock *sk) | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | static struct tcp_congestion_ops tcp_scalable = { | 38 | static struct tcp_congestion_ops tcp_scalable __read_mostly = { |
| 39 | .ssthresh = tcp_scalable_ssthresh, | 39 | .ssthresh = tcp_scalable_ssthresh, |
| 40 | .cong_avoid = tcp_scalable_cong_avoid, | 40 | .cong_avoid = tcp_scalable_cong_avoid, |
| 41 | .min_cwnd = tcp_reno_min_cwnd, | 41 | .min_cwnd = tcp_reno_min_cwnd, |