Commit d7180080 authored by Heng Qi's avatar Heng Qi Committed by David S. Miller
Browse files

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: default avatarHeng Qi <hengqi@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7949c06a

drivers/net/virtio_net.c

+28 −3
Original line number Diff line number Diff line
@@ -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,

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)

{