diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-08 13:15:38 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-08 13:47:38 -0800 |
commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /net/ipv4/tcp.c | |
parent | f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff) | |
parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
download | kernel_samsung_crespo-fe6c791570efe717946ea7b7dd50aec96b70d551.zip kernel_samsung_crespo-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.gz kernel_samsung_crespo-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.bz2 |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 2bb46d5..6c11eec 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2244,7 +2244,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, /* Values greater than interface MTU won't take effect. However * at the point when this call is done we typically don't yet * know which interface is going to be used */ - if (val < 64 || val > MAX_TCP_WINDOW) { + if (val < TCP_MIN_MSS || val > MAX_TCP_WINDOW) { err = -EINVAL; break; } |