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: Talal Ahmad <talalahmad@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Arjun Roy <arjunroy@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/sock.h b/include/net/sock.h
index 620de053002d71d42a73c7a429d9163f0c7e8669..b32906e1ab55527b5418f203d3de05853863f166 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -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) {

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 8e8c5922a7b0c0a268a4c5a53d223489a10ca0bd..70972f3ac8fa391e0d747c878cf9fd8a7a0cedff 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -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)

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index a7b1138d619cd478a67ebaa28f451a4f8c860520..bc7f419184aa502f549c25aeb12a09f1067d0a37 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -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);

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 6867e5db3e352d35b94b212db8b72f88672e3d1d..6fbbf155803372efed056a6f4df8809f7734be68 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -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);