diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:24 -0400 |
| commit | 343b0597297c3190647854881c087c01faf40a6f (patch) | |
| tree | 81cf818936bfd4aff891d1ca4d4ea4d47b2d1631 /net/ipv4/tcp.c | |
| parent | b2dabd5aadae6a93026f35269e1e53c1a0c6de2d (diff) | |
| parent | b2382b363df828f25e35ed8b70a3da33b29b2a64 (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
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 ddb6ce4ecff..69b1fcf7007 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; } |