diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 11:06:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 11:06:56 -0700 |
| commit | 3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f (patch) | |
| tree | 5539ec43768de877137c1971502a5e69cd9f0836 /net/ipv4/tcp_output.c | |
| parent | a4cce10492358b33d33bb43f98284c80482037e8 (diff) | |
| parent | dc16aaf29d64b8c5e0b88f49a4d541edf5b61e42 (diff) | |
| download | kernel-crypto-3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f.tar.gz kernel-crypto-3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f.tar.xz kernel-crypto-3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 566045e5843..dd30dd137b7 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -925,10 +925,6 @@ static int tcp_tso_should_defer(struct sock *sk, struct tcp_sock *tp, struct sk_ limit = min(send_win, cong_win); - /* If sk_send_head can be sent fully now, just do it. */ - if (skb->len <= limit) - return 0; - if (sysctl_tcp_tso_win_divisor) { u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache); |