diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-11 09:43:11 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-11 09:43:11 -0700 |
| commit | e7578c08a4dee36fe01fb38805f325689e642eb0 (patch) | |
| tree | 7426054f6226aa2349ee0c0a3970aeef9276ea59 /net/ipv4/tcp_timer.c | |
| parent | 763b3917e779c9c25d56fc71a796774185cd6ce2 (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
| download | kernel-crypto-e7578c08a4dee36fe01fb38805f325689e642eb0.tar.gz kernel-crypto-e7578c08a4dee36fe01fb38805f325689e642eb0.tar.xz kernel-crypto-e7578c08a4dee36fe01fb38805f325689e642eb0.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index b127b449856..0084227438c 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -231,11 +231,10 @@ static void tcp_delack_timer(unsigned long data) } tp->ack.pending &= ~TCP_ACK_TIMER; - if (skb_queue_len(&tp->ucopy.prequeue)) { + if (!skb_queue_empty(&tp->ucopy.prequeue)) { struct sk_buff *skb; - NET_ADD_STATS_BH(LINUX_MIB_TCPSCHEDULERFAILED, - skb_queue_len(&tp->ucopy.prequeue)); + NET_INC_STATS_BH(LINUX_MIB_TCPSCHEDULERFAILED); while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) sk->sk_backlog_rcv(sk, skb); |