Commit 03271f3a authored by Talal Ahmad's avatar Talal Ahmad Committed by Jakub Kicinski
Browse files

tcp: rename sk_wmem_free_skb 



sk_wmem_free_skb() is only used by TCP.

Rename it to make this clear, and move its declaration to
include/net/tcp.h

Signed-off-by: default avatarTalal Ahmad <talalahmad@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Acked-by: default avatarArjun Roy <arjunroy@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 047304d0

include/net/sock.h

+0 −7
Original line number Diff line number Diff line
@@ -1603,13 +1603,6 @@ static inline void sk_mem_uncharge(struct sock *sk, int size) 
		__sk_mem_reclaim(sk, SK_RECLAIM_CHUNK);

}



static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb)

{

	sk_wmem_queued_add(sk, -skb->truesize);

	sk_mem_uncharge(sk, skb->truesize);

	__kfree_skb(skb);

}



static inline void sock_release_ownership(struct sock *sk)

{

	if (sk->sk_lock.owned) {

include/net/tcp.h

+8 −1
Original line number Diff line number Diff line
@@ -290,6 +290,13 @@ static inline bool tcp_out_of_memory(struct sock *sk) 
	return false;

}



static inline void tcp_wmem_free_skb(struct sock *sk, struct sk_buff *skb)

{

	sk_wmem_queued_add(sk, -skb->truesize);

	sk_mem_uncharge(sk, skb->truesize);

	__kfree_skb(skb);

}



void sk_forced_mem_schedule(struct sock *sk, int size);



bool tcp_check_oom(struct sock *sk, int shift);
@@ -1875,7 +1882,7 @@ static inline void tcp_rtx_queue_unlink_and_free(struct sk_buff *skb, struct soc 
{

	list_del(&skb->tcp_tsorted_anchor);

	tcp_rtx_queue_unlink(skb, sk);

	sk_wmem_free_skb(sk, skb);

	tcp_wmem_free_skb(sk, skb);

}



static inline void tcp_push_pending_frames(struct sock *sk)

net/ipv4/tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ void tcp_remove_empty_skb(struct sock *sk) 
		tcp_unlink_write_queue(skb, sk);

		if (tcp_write_queue_empty(sk))

			tcp_chrono_stop(sk, TCP_CHRONO_BUSY);

		sk_wmem_free_skb(sk, skb);

		tcp_wmem_free_skb(sk, skb);

	}

}
@@ -2893,7 +2893,7 @@ static void tcp_rtx_queue_purge(struct sock *sk) 
		 * list_del(&skb->tcp_tsorted_anchor)

		 */

		tcp_rtx_queue_unlink(skb, sk);

		sk_wmem_free_skb(sk, skb);

		tcp_wmem_free_skb(sk, skb);

	}

}
@@ -2904,7 +2904,7 @@ void tcp_write_queue_purge(struct sock *sk) 
	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);

		tcp_wmem_free_skb(sk, skb);

	}

	tcp_rtx_queue_purge(sk);

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

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -2412,7 +2412,7 @@ static int tcp_mtu_probe(struct sock *sk) 
			TCP_SKB_CB(nskb)->eor = TCP_SKB_CB(skb)->eor;

			tcp_skb_collapse_tstamp(nskb, skb);

			tcp_unlink_write_queue(skb, sk);

			sk_wmem_free_skb(sk, skb);

			tcp_wmem_free_skb(sk, skb);

		} else {

			TCP_SKB_CB(nskb)->tcp_flags |= TCP_SKB_CB(skb)->tcp_flags &

						   ~(TCPHDR_FIN|TCPHDR_PSH);