netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] virtio_net: implements ethtool_ops.get_drvinfo
@ 2010-08-05  3:32 Rusty Russell
  2010-08-05  3:47 ` Ben Hutchings
  0 siblings, 1 reply; 11+ messages in thread
From: Rusty Russell @ 2010-08-05  3:32 UTC (permalink / raw)
  To: netdev; +Cc: Michael S. Tsirkin, Taku Izumi

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)
---
 drivers/net/virtio_net.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

Index: net-next.35/drivers/net/virtio_net.c
===================================================================
--- net-next.35.orig/drivers/net/virtio_net.c
+++ net-next.35/drivers/net/virtio_net.c
@@ -701,6 +701,19 @@ static int virtnet_close(struct net_devi
 	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);
@@ -813,6 +825,7 @@ static void virtnet_vlan_rx_kill_vid(str
 }
 
 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,

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [PATCH] virtio_net: implements ethtool_ops.get_drvinfo
@ 2010-06-11  1:29 Taku Izumi
  2010-06-15  4:28 ` Rusty Russell
  0 siblings, 1 reply; 11+ messages in thread
From: Taku Izumi @ 2010-06-11  1:29 UTC (permalink / raw)
  To: David S. Miller, netdev@vger.kernel.org, rusty

This patch implements ethtool_ops.get_drvinfo interface of virtio_net driver.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
---
 drivers/net/virtio_net.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

Index: net-next.35/drivers/net/virtio_net.c
===================================================================
--- net-next.35.orig/drivers/net/virtio_net.c
+++ net-next.35/drivers/net/virtio_net.c
@@ -701,6 +701,18 @@ static int virtnet_close(struct net_devi
 	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, 32);
+	strncpy(drvinfo->version, "N/A", 32);
+	strncpy(drvinfo->fw_version, "N/A", 32);
+	strncpy(drvinfo->bus_info, dev_name(&vdev->dev), 32);
+}
+
 static int virtnet_set_tx_csum(struct net_device *dev, u32 data)
 {
 	struct virtnet_info *vi = netdev_priv(dev);
@@ -813,6 +825,7 @@ static void virtnet_vlan_rx_kill_vid(str
 }

 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,


^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-08-17  8:50 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-05  3:32 [PATCH] virtio_net: implements ethtool_ops.get_drvinfo Rusty Russell
2010-08-05  3:47 ` Ben Hutchings
2010-08-05  4:54   ` David Miller
2010-08-05 19:20     ` [PATCH] ethtool: Provide a default implementation of ethtool_ops::get_drvinfo Ben Hutchings
2010-08-17  8:50       ` David Miller
2010-08-06 15:59   ` [PATCH] virtio_net: implements ethtool_ops.get_drvinfo Loke, Chetan
2010-08-06 16:15     ` Ben Hutchings
  -- strict thread matches above, loose matches on Subject: below --
2010-06-11  1:29 Taku Izumi
2010-06-15  4:28 ` Rusty Russell
2010-06-15  5:20   ` Taku Izumi
2010-06-16  1:54     ` Rusty Russell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).