virtio-net: separate rx/tx coalescing moderation cmds

This patch separates the rx and tx global coalescing moderation
commands to support netdim switches in subsequent patches.

Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 0ad2894e6a5e6ba83f3aa705d4f32e4480fe8cc3..0285301caf782c43841c1ddc1495e57844005a4e 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3266,10 +3266,10 @@ static int virtnet_get_link_ksettings(struct net_device *dev,
        return 0;
 }
 
-static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
-                                      struct ethtool_coalesce *ec)
+static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi,
+                                         struct ethtool_coalesce *ec)
 {
-       struct scatterlist sgs_tx, sgs_rx;
+       struct scatterlist sgs_tx;
        int i;
 
        vi->ctrl->coal_tx.tx_usecs = cpu_to_le32(ec->tx_coalesce_usecs);
@@ -3289,6 +3289,15 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
                vi->sq[i].intr_coal.max_packets = ec->tx_max_coalesced_frames;
        }
 
+       return 0;
+}
+
+static int virtnet_send_rx_notf_coal_cmds(struct virtnet_info *vi,
+                                         struct ethtool_coalesce *ec)
+{
+       struct scatterlist sgs_rx;
+       int i;
+
        vi->ctrl->coal_rx.rx_usecs = cpu_to_le32(ec->rx_coalesce_usecs);
        vi->ctrl->coal_rx.rx_max_packets = cpu_to_le32(ec->rx_max_coalesced_frames);
        sg_init_one(&sgs_rx, &vi->ctrl->coal_rx, sizeof(vi->ctrl->coal_rx));
@@ -3309,6 +3318,22 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
        return 0;
 }
 
+static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
+                                      struct ethtool_coalesce *ec)
+{
+       int err;
+
+       err = virtnet_send_tx_notf_coal_cmds(vi, ec);
+       if (err)
+               return err;
+
+       err = virtnet_send_rx_notf_coal_cmds(vi, ec);
+       if (err)
+               return err;
+
+       return 0;
+}
+
 static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,
                                         u16 vqn, u32 max_usecs, u32 max_packets)
 {