]> err.no Git - linux-2.6/commitdiff
[TCP]: "Annotate" another fackets_out state reset
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Mon, 8 Oct 2007 06:37:55 +0000 (23:37 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:54:48 +0000 (16:54 -0700)
This should no longer be necessary because fackets_out is
accurate. It indicates bugs elsewhere, thus report it.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c

index 7c1a92ffa0839b9c51183d1b449e665bb1c41863..4268cd13ff9a2b3f0d3429ab229df978111f1b39 100644 (file)
@@ -1160,7 +1160,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
        int first_sack_index;
 
        if (!tp->sacked_out) {
-               tp->fackets_out = 0;
+               if (WARN_ON(tp->fackets_out))
+                       tp->fackets_out = 0;
                tp->highest_sack = tp->snd_una;
        }
        prior_fackets = tp->fackets_out;