diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 12:41:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 12:41:09 +1100 |
| commit | 5cdb6688c5db7f92821db5ef2ca3c0c0ff52c23b (patch) | |
| tree | ecbf35920ddeb05781f3b58f26dbfa5407a8a314 /net/ipv4/tcp_illinois.c | |
| parent | 2e90d1edd450555b4daa96bca69f61be336baf1e (diff) | |
| parent | 33175d84ee3fa29991adb80513683e010769e807 (diff) | |
Merge remote-tracking branch 'net/master'
Conflicts:
drivers/net/Kconfig
lib/Makefile
Diffstat (limited to 'net/ipv4/tcp_illinois.c')
| -rw-r--r-- | net/ipv4/tcp_illinois.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c index 00ca688d8964..813b43a76fec 100644 --- a/net/ipv4/tcp_illinois.c +++ b/net/ipv4/tcp_illinois.c @@ -322,7 +322,7 @@ static void tcp_illinois_info(struct sock *sk, u32 ext, } } -static struct tcp_congestion_ops tcp_illinois = { +static struct tcp_congestion_ops tcp_illinois __read_mostly = { .flags = TCP_CONG_RTT_STAMP, .init = tcp_illinois_init, .ssthresh = tcp_illinois_ssthresh, |