]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[TCP]: Kill almost unused variable pcount from sacktag
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Fri, 12 Oct 2007 00:33:55 +0000 (17:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Oct 2007 00:33:55 +0000 (17:33 -0700)
It's on the way for future cutting of that function.

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 c827285b488e37cbca464b15fcdb2362d47af5da..50047045df628b5757f7ab76453a7f561deea2ae 100644 (file)
@@ -1314,7 +1314,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
                        flag |= FLAG_DATA_LOST;
 
                tcp_for_write_queue_from(skb, sk) {
-                       int in_sack, pcount;
+                       int in_sack;
                        u8 sacked;
 
                        if (skb == tcp_send_head(sk))
@@ -1336,9 +1336,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
                        in_sack = !after(start_seq, TCP_SKB_CB(skb)->seq) &&
                                !before(end_seq, TCP_SKB_CB(skb)->end_seq);
 
-                       pcount = tcp_skb_pcount(skb);
-
-                       if (pcount > 1 && !in_sack &&
+                       if (tcp_skb_pcount(skb) > 1 && !in_sack &&
                            after(TCP_SKB_CB(skb)->end_seq, start_seq)) {
                                unsigned int pkt_len;
 
@@ -1353,10 +1351,9 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
                                                   TCP_SKB_CB(skb)->seq);
                                if (tcp_fragment(sk, skb, pkt_len, skb_shinfo(skb)->gso_size))
                                        break;
-                               pcount = tcp_skb_pcount(skb);
                        }
 
-                       fack_count += pcount;
+                       fack_count += tcp_skb_pcount(skb);
 
                        sacked = TCP_SKB_CB(skb)->sacked;