Commit ac3f09ba authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: uninline tcp_write_queue_purge() 



Since the upcoming rtx rbtree will add some extra code,
it is time to not inline this fat function anymore.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18a4c0ea

include/net/tcp.h

+1 −14
Original line number Diff line number Diff line
@@ -1606,20 +1606,7 @@ static inline void tcp_skb_tsorted_anchor_cleanup(struct sk_buff *skb) 
	skb->_skb_refdst = _save;		\

}



/* write queue abstraction */

static inline void tcp_write_queue_purge(struct sock *sk)

{

	struct sk_buff *skb;



	tcp_chrono_stop(sk, TCP_CHRONO_BUSY);

	while ((skb = __skb_dequeue(&sk->sk_write_queue)) != NULL) {

		tcp_skb_tsorted_anchor_cleanup(skb);

		sk_wmem_free_skb(sk, skb);

	}

	INIT_LIST_HEAD(&tcp_sk(sk)->tsorted_sent_queue);

	sk_mem_reclaim(sk);

	tcp_clear_all_retrans_hints(tcp_sk(sk));

}

void tcp_write_queue_purge(struct sock *sk);



static inline struct sk_buff *tcp_write_queue_head(const struct sock *sk)

{

net/ipv4/tcp.c

+14 −0
Original line number Diff line number Diff line
@@ -2318,6 +2318,20 @@ static inline bool tcp_need_reset(int state) 
		TCPF_FIN_WAIT2 | TCPF_SYN_RECV);

}



void tcp_write_queue_purge(struct sock *sk)

{

	struct sk_buff *skb;



	tcp_chrono_stop(sk, TCP_CHRONO_BUSY);

	while ((skb = __skb_dequeue(&sk->sk_write_queue)) != NULL) {

		tcp_skb_tsorted_anchor_cleanup(skb);

		sk_wmem_free_skb(sk, skb);

	}

	INIT_LIST_HEAD(&tcp_sk(sk)->tsorted_sent_queue);

	sk_mem_reclaim(sk);

	tcp_clear_all_retrans_hints(tcp_sk(sk));

}



int tcp_disconnect(struct sock *sk, int flags)

{

	struct inet_sock *inet = inet_sk(sk);