]> err.no Git - linux-2.6/commitdiff
[TCP]: Urgent parameter effect can be simplified.
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Fri, 4 Jan 2008 04:38:05 +0000 (20:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 23:00:33 +0000 (15:00 -0800)
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_output.c

index f6d279a95f4bb1c629ad2d888792a568946cb38a..6c7cd0a9098aae6650e21bad5f5960d91beac4bb 100644 (file)
@@ -2488,7 +2488,7 @@ static int tcp_xmit_probe_skb(struct sock *sk, int urgent)
         * end to send an ack.  Don't queue or clone SKB, just
         * send it.
         */
-       TCP_SKB_CB(skb)->seq = urgent ? tp->snd_una : tp->snd_una - 1;
+       TCP_SKB_CB(skb)->seq = tp->snd_una - !urgent;
        TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
        return tcp_transmit_skb(sk, skb, 0, GFP_ATOMIC);