diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
| commit | 943550a24c51bdd971f579200f286241548deaf7 (patch) | |
| tree | 4b275941890744cf4ea588ea59db7cd6558647b6 /include/net/tcp.h | |
| parent | 0356888ad14044efe98b16a731ba56d74b89269e (diff) | |
| parent | a3b71254e95dc167ddca600c0ca426e8ce2fad3f (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-androidlsk-android-14.03
Conflicts:
arch/arm64/include/asm/cmpxchg.h
drivers/cpufreq/cpufreq.c
include/net/tcp.h
net/ipv4/ping.c
net/ipv4/sysctl_net_ipv4.c
net/netfilter/xt_qtaguid.c
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index a67601f2cb50..c10bd7a33492 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -288,6 +288,7 @@ extern int sysctl_tcp_early_retrans; extern int sysctl_tcp_limit_output_bytes; extern int sysctl_tcp_challenge_ack_limit; extern int sysctl_tcp_min_tso_segs; +extern int sysctl_tcp_default_init_rwnd; extern atomic_long_t tcp_memory_allocated; extern struct percpu_counter tcp_sockets_allocated; |