Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9144bd8 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[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: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52240062

include/net/tcp.h

+0 −6
Original line number Diff line number Diff line
@@ -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 */

net/ipv4/tcp_input.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}