[net-next,17/19] net: usb: aqc111: Initialize ethtool_ops structure

Commit Message

Igor Russkikh Oct. 5, 2018, 10:25 a.m. UTC

From: Dmitry Bezrukov <[e-mail]>

Implement get_drvinfo, set/get_msglevel, get_link callbacks

Signed-off-by: Dmitry Bezrukov <[e-mail]>
Signed-off-by: Igor Russkikh <[e-mail]>
---
 drivers/net/usb/aqc111.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

Comments

Andrew Lunn Oct. 6, 2018, 5:08 p.m. UTC | #1

On Fri, Oct 05, 2018 at 10:25:22AM +0000, Igor Russkikh wrote:
> From: Dmitry Bezrukov <[e-mail]>
> 
> Implement get_drvinfo, set/get_msglevel, get_link callbacks
> 
> Signed-off-by: Dmitry Bezrukov <[e-mail]>
> Signed-off-by: Igor Russkikh <[e-mail]>
> ---
>  drivers/net/usb/aqc111.c | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
> 
> diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
> index 9908b0a04da6..ade2b60b4811 100644
> --- a/drivers/net/usb/aqc111.c
> +++ b/drivers/net/usb/aqc111.c
> @@ -9,6 +9,7 @@
>  
>  #include <linux/module.h>
>  #include <linux/netdevice.h>
> +#include <linux/ethtool.h>
>  #include <linux/mii.h>
>  #include <linux/usb.h>
>  #include <linux/crc32.h>
> @@ -18,6 +19,9 @@
>  
>  #include "aqc111.h"
>  
> +#define DRIVER_VERSION "1.0.0.0"

Hi Igor

This is been discussed a number of times before, and i expect it to be
discussed again. Driver versions of useless. Please drop it.

> +#define DRIVER_NAME "Aquantia AQtion USB to 5GbE"

It might be nice to include the module name in here, making it easy to
link the module to the driver.

> +
>  static int __aqc111_read_cmd(struct usbnet *dev, u8 cmd, u16 value,
>  			     u16 index, u16 size, void *data, int nopm)
>  {
> @@ -170,6 +174,24 @@ static int aq_mdio_write_cmd(struct usbnet *dev, u16 value, u16 index,
>  	return aqc111_write_cmd(dev, AQ_PHY_CMD, value, index, size, data);
>  }
>  

   Andrew

Patch

diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
index 9908b0a04da6..ade2b60b4811 100644
--- a/drivers/net/usb/aqc111.c
+++ b/drivers/net/usb/aqc111.c
@@ -9,6 +9,7 @@ 
 
 #include <linux/module.h>
 #include <linux/netdevice.h>
+#include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/crc32.h>
@@ -18,6 +19,9 @@ 
 
 #include "aqc111.h"
 
+#define DRIVER_VERSION "1.0.0.0"
+#define DRIVER_NAME "Aquantia AQtion USB to 5GbE"
+
 static int __aqc111_read_cmd(struct usbnet *dev, u8 cmd, u16 value,
 			     u16 index, u16 size, void *data, int nopm)
 {
@@ -170,6 +174,24 @@  static int aq_mdio_write_cmd(struct usbnet *dev, u16 value, u16 index,
 	return aqc111_write_cmd(dev, AQ_PHY_CMD, value, index, size, data);
 }
 
+static void aqc111_get_drvinfo(struct net_device *net,
+			       struct ethtool_drvinfo *info)
+{
+	struct usbnet *dev = netdev_priv(net);
+	struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0];
+
+	/* Inherit standard device info */
+	usbnet_get_drvinfo(net, info);
+	strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
+	strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+	snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u",
+		 aqc111_data->fw_ver.major,
+		 aqc111_data->fw_ver.minor,
+		 aqc111_data->fw_ver.rev);
+	info->eedump_len = 0x00;
+	info->regdump_len = 0x00;
+}
+
 static void aqc111_set_phy_speed_fw_iface(struct usbnet *dev,
 					  struct aqc111_data *aqc111_data)
 {
@@ -286,6 +308,13 @@  static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed)
 		aqc111_set_phy_speed_fw_iface(dev, aqc111_data);
 }
 
+static const struct ethtool_ops aqc111_ethtool_ops = {
+	.get_drvinfo = aqc111_get_drvinfo,
+	.get_msglevel = usbnet_get_msglevel,
+	.set_msglevel = usbnet_set_msglevel,
+	.get_link = ethtool_op_get_link,
+};
+
 static int aqc111_change_mtu(struct net_device *net, int new_mtu)
 {
 	struct usbnet *dev = netdev_priv(net);
@@ -605,6 +634,7 @@  static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf)
 	dev->net->needed_tailroom += AQ_TX_HEADER_SIZE;
 
 	dev->net->netdev_ops = &aqc111_netdev_ops;
+	dev->net->ethtool_ops = &aqc111_ethtool_ops;
 
 	if (usb_device_no_sg_constraint(dev->udev))
 		dev->can_dma_sg = 1;