[PATCH net v3 3/3] virtio-net: clean up __virtnet_rx_pause/resume

[Bui Quang Minh]

The delayed refill worker is removed which makes virtnet_rx_pause/resume
quite the same as __virtnet_rx_pause/resume. So remove
__virtnet_rx_pause/resume and move the code to virtnet_rx_pause/resume.

Acked-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Bui Quang Minh <minhquangbu...@gmail.com>
---
 drivers/net/virtio_net.c | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index a4dbc958689b..745bae756920 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3369,8 +3369,8 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct 
net_device *dev)
        return NETDEV_TX_OK;
 }
 
-static void __virtnet_rx_pause(struct virtnet_info *vi,
-                              struct receive_queue *rq)
+static void virtnet_rx_pause(struct virtnet_info *vi,
+                            struct receive_queue *rq)
 {
        bool running = netif_running(vi->dev);
 
@@ -3385,17 +3385,12 @@ static void virtnet_rx_pause_all(struct virtnet_info 
*vi)
        int i;
 
        for (i = 0; i < vi->max_queue_pairs; i++)
-               __virtnet_rx_pause(vi, &vi->rq[i]);
+               virtnet_rx_pause(vi, &vi->rq[i]);
 }
 
-static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq)
-{
-       __virtnet_rx_pause(vi, rq);
-}
-
-static void __virtnet_rx_resume(struct virtnet_info *vi,
-                               struct receive_queue *rq,
-                               bool refill)
+static void virtnet_rx_resume(struct virtnet_info *vi,
+                             struct receive_queue *rq,
+                             bool refill)
 {
        if (netif_running(vi->dev)) {
                /* Pre-fill rq agressively, to make sure we are ready to get
@@ -3414,17 +3409,12 @@ static void virtnet_rx_resume_all(struct virtnet_info 
*vi)
 
        for (i = 0; i < vi->max_queue_pairs; i++) {
                if (i < vi->curr_queue_pairs)
-                       __virtnet_rx_resume(vi, &vi->rq[i], true);
+                       virtnet_rx_resume(vi, &vi->rq[i], true);
                else
-                       __virtnet_rx_resume(vi, &vi->rq[i], false);
+                       virtnet_rx_resume(vi, &vi->rq[i], false);
        }
 }
 
-static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queue 
*rq)
-{
-       __virtnet_rx_resume(vi, rq, true);
-}
-
 static int virtnet_rx_resize(struct virtnet_info *vi,
                             struct receive_queue *rq, u32 ring_num)
 {
@@ -3438,7 +3428,7 @@ static int virtnet_rx_resize(struct virtnet_info *vi,
        if (err)
                netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: 
%d\n", qindex, err);
 
-       virtnet_rx_resume(vi, rq);
+       virtnet_rx_resume(vi, rq, true);
        return err;
 }
 
@@ -5811,7 +5801,7 @@ static int virtnet_rq_bind_xsk_pool(struct virtnet_info 
*vi, struct receive_queu
 
        rq->xsk_pool = pool;
 
-       virtnet_rx_resume(vi, rq);
+       virtnet_rx_resume(vi, rq, true);
 
        if (pool)
                return 0;
-- 
2.43.0