From: Jason Wang <jasowang@redhat.com>
Date: Fri, 20 Jul 2018 08:15:19 +0800
Subject: vhost_net: rename vhost_rx_signal_used() to vhost_net_signal_used()
Patch-mainline: v4.19-rc1
Git-commit: 09c3248938c3e3b0ef870c8f1b3f13d6dcbf67ce
References: bsc#1109837
Rename for reusing this for TX.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/vhost/net.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -738,7 +738,7 @@ static int sk_has_rx_data(struct sock *s
return skb_queue_empty(&sk->sk_receive_queue);
}
-static void vhost_rx_signal_used(struct vhost_net_virtqueue *nvq)
+static void vhost_net_signal_used(struct vhost_net_virtqueue *nvq)
{
struct vhost_virtqueue *vq = &nvq->vq;
struct vhost_dev *dev = vq->dev;
@@ -762,7 +762,7 @@ static int vhost_net_rx_peek_head_len(st
if (!len && tvq->busyloop_timeout) {
/* Flush batched heads first */
- vhost_rx_signal_used(rnvq);
+ vhost_net_signal_used(rnvq);
/* Both tx vq and rx socket were polled here */
mutex_lock_nested(&tvq->mutex, 1);
vhost_disable_notify(&net->dev, tvq);
@@ -1005,7 +1005,7 @@ static void handle_rx(struct vhost_net *
}
nvq->done_idx += headcount;
if (nvq->done_idx > VHOST_RX_BATCH)
- vhost_rx_signal_used(nvq);
+ vhost_net_signal_used(nvq);
if (unlikely(vq_log))
vhost_log_write(vq, vq_log, log, vhost_len);
total_len += vhost_len;
@@ -1019,7 +1019,7 @@ static void handle_rx(struct vhost_net *
else
vhost_net_enable_vq(net, vq);
out:
- vhost_rx_signal_used(nvq);
+ vhost_net_signal_used(nvq);
mutex_unlock(&vq->mutex);
}