From: David S. Miller <davem@davemloft.net>
Date: Tue, 5 Jul 2005 22:19:38 +0000 (-0700)
Subject: [TCP]: Fix __tcp_push_pending_frames() 'nonagle' handling.
X-Git-Tag: v2.6.13-rc2~6^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55c97f3e990c1ff63957c64f6cb10711a09fd70e;p=pandora-kernel.git

[TCP]: Fix __tcp_push_pending_frames() 'nonagle' handling.

'nonagle' should be passed to the tcp_snd_test() function
as 'TCP_NAGLE_PUSH' if we are checking an SKB not at the
tail of the write_queue.  This is because Nagle does not
apply to such frames since we cannot possibly tack more
data onto them.

However, while doing this __tcp_push_pending_frames() makes
all of the packets in the write_queue use this modified
'nonagle' value.

Fix the bug and simplify this function by just calling
tcp_write_xmit() directly if sk_send_head is non-NULL.

As a result, we can now make tcp_data_snd_check() just call
tcp_push_pending_frames() instead of the specialized
__tcp_data_snd_check().

Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed