virtio_net: implements ethtool_ops.get_drvinfo (a767bde4) · Commits · 戴 / test

I often use "ethtool -i" command to check what driver controls the ehternet device. But because current virtio_net driver doesn't support "ethtool -i", it becomes the following: # ethtool -i eth3 Cannot get driver information: Operation not supported This patch simply adds the "ethtool -i" support. The following is the result when using the virtio_net driver with my patch applied to. # ethtool -i eth3 driver: virtio_net version: N/A firmware-version: N/A bus-info: virtio0 Personally, "-i" is one of the most frequently-used option, and most network drivers support "ethtool -i", so I think virtio_net also should do. Signed-off-by:

Taku Izumi <izumi.taku@jp.fujitsu.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (use ARRAY_SIZE) Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/virtio_net.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -705,6 +705,19 @@ static int virtnet_close(struct net_device *dev)
		return 0;
		}

		static void virtnet_get_drvinfo(struct net_device *dev,
		struct ethtool_drvinfo *drvinfo)
		{
		struct virtnet_info *vi = netdev_priv(dev);
		struct virtio_device *vdev = vi->vdev;

		strncpy(drvinfo->driver, KBUILD_MODNAME, ARRAY_SIZE(drvinfo->driver));
		strncpy(drvinfo->version, "N/A", ARRAY_SIZE(drvinfo->version));
		strncpy(drvinfo->fw_version, "N/A", ARRAY_SIZE(drvinfo->fw_version));
		strncpy(drvinfo->bus_info, dev_name(&vdev->dev),
		ARRAY_SIZE(drvinfo->bus_info));
		}

		static int virtnet_set_tx_csum(struct net_device *dev, u32 data)
		{
		struct virtnet_info *vi = netdev_priv(dev);
		@@ -817,6 +830,7 @@ static void virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
		}

		static const struct ethtool_ops virtnet_ethtool_ops = {
		.get_drvinfo = virtnet_get_drvinfo,
		.set_tx_csum = virtnet_set_tx_csum,
		.set_sg = ethtool_op_set_sg,
		.set_tso = ethtool_op_set_tso,

Admin message