[TCP]: Remove unnecessary wrapper tcp_packets_out_dec

Makes caller side more obvious, there's no need to have
a wrapper for this oneliner!

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

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 0a4ed6e85c6ffba5beaa823a41348efffe5fc4d3..66827177ae8bb0480a572e6899fbb6ac55ce1dd0 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -626,12 +626,6 @@ static inline void tcp_packets_out_inc(struct sock *sk,
                                          inet_csk(sk)->icsk_rto, TCP_RTO_MAX);
 }
 
-static inline void tcp_packets_out_dec(struct tcp_sock *tp, 
-                                      const struct sk_buff *skb)
-{
-       tp->packets_out -= tcp_skb_pcount(skb);
-}
-
 /* Events passed to congestion control interface */
 enum tcp_ca_event {
        CA_EVENT_TX_START,      /* first transmit when no packets in flight */

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index faba9beb361373624ff22cb5d75c4f4e2379d3cd..593960d66ed968e8a8499cf272bd96acc137d350 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2569,7 +2569,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p)
                        last_ackt = skb->tstamp;
                }
                tcp_dec_pcount_approx(&tp->fackets_out, skb);
-               tcp_packets_out_dec(tp, skb);
+               tp->packets_out -= tcp_skb_pcount(skb);
                tcp_unlink_write_queue(skb, sk);
                sk_stream_free_skb(sk, skb);
                clear_all_retrans_hints(tp);

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index a3679174e78a624c217797392edcab95fd9aded0..1d65ce1b68d7cde690f30ed75549ffde2b70048d 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1735,7 +1735,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m
                 * it is better to underestimate fackets.
                 */
                tcp_dec_pcount_approx(&tp->fackets_out, next_skb);
-               tcp_packets_out_dec(tp, next_skb);
+               tp->packets_out -= tcp_skb_pcount(next_skb);
                sk_stream_free_skb(sk, next_skb);
        }
 }