diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 00:55:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 00:55:22 -0400 |
| commit | 617e44fdfd7ee3d53388ab295d9411b826437ce9 (patch) | |
| tree | ed6bd2a5960f706fa93c6df2cbfb75ede926fd1c /net/ipv4/tcp.c | |
| parent | 4887f76ec3d38e99286c9d0fdd6a719174d02e44 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge /spare/repo/linux-2.6/
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 ddb6ce4ecff2..69b1fcf70077 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -584,7 +584,7 @@ static inline void skb_entail(struct sock *sk, struct tcp_sock *tp, sk_charge_skb(sk, skb); if (!sk->sk_send_head) sk->sk_send_head = skb; - else if (tp->nonagle&TCP_NAGLE_PUSH) + if (tp->nonagle & TCP_NAGLE_PUSH) tp->nonagle &= ~TCP_NAGLE_PUSH; } |