summaryrefslogtreecommitdiff
path: root/net/ipv6/tcp_ipv6.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 18:41:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 18:41:58 -0700
commit5432ebb5f67f0be3264feb646f6f8f6c326899c9 (patch)
tree4a44975a8005fc67d7eca913eaed379bd3d49c8a /net/ipv6/tcp_ipv6.c
parentd06e7a56d91328267a96b1a4df4ede7529f829e8 (diff)
parentb2f571026594884e7a2a3f8bc6ad5c92e0703330 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r--net/ipv6/tcp_ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 9dac7fdf4726..f6e288dc116e 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2018,7 +2018,7 @@ static int tcp_v6_init_sock(struct sock *sk)
*/
tp->snd_ssthresh = 0x7fffffff;
tp->snd_cwnd_clamp = ~0;
- tp->mss_cache_std = tp->mss_cache = 536;
+ tp->mss_cache = 536;
tp->reordering = sysctl_tcp_reordering;