1 files changed, 19 insertions, 13 deletions

diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index aea4645be7f6..6998aa6b7bb7 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -847,7 +847,7 @@ static void ax88172_set_multicast(struct net_device *net)
 static int ax88172_link_reset(struct usbnet *dev)
 {
         u8 mode;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
 
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
@@ -856,8 +856,8 @@ static int ax88172_link_reset(struct usbnet *dev)
         if (ecmd.duplex != DUPLEX_FULL)
                 mode |= ~AX88172_MEDIUM_FD;
 
-        netdev_dbg(dev->net, "ax88172_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",
-                   ecmd.speed, ecmd.duplex, mode);
+        netdev_dbg(dev->net, "ax88172_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
+                   ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
 
         asix_write_medium_mode(dev, mode);
 
@@ -947,20 +947,20 @@ static const struct ethtool_ops ax88772_ethtool_ops = {
 static int ax88772_link_reset(struct usbnet *dev)
 {
         u16 mode;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
 
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
         mode = AX88772_MEDIUM_DEFAULT;
 
-        if (ecmd.speed != SPEED_100)
+        if (ethtool_cmd_speed(&ecmd) != SPEED_100)
                 mode &= ~AX_MEDIUM_PS;
 
         if (ecmd.duplex != DUPLEX_FULL)
                 mode &= ~AX_MEDIUM_FD;
 
-        netdev_dbg(dev->net, "ax88772_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",
-                   ecmd.speed, ecmd.duplex, mode);
+        netdev_dbg(dev->net, "ax88772_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
+                   ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
 
         asix_write_medium_mode(dev, mode);
 
@@ -1173,18 +1173,20 @@ static int marvell_led_status(struct usbnet *dev, u16 speed)
 static int ax88178_link_reset(struct usbnet *dev)
 {
         u16 mode;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
         struct asix_data *data = (struct asix_data *)&dev->data;
+        u32 speed;
 
         netdev_dbg(dev->net, "ax88178_link_reset()\n");
 
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
         mode = AX88178_MEDIUM_DEFAULT;
+        speed = ethtool_cmd_speed(&ecmd);
 
-        if (ecmd.speed == SPEED_1000)
+        if (speed == SPEED_1000)
                 mode |= AX_MEDIUM_GM;
-        else if (ecmd.speed == SPEED_100)
+        else if (speed == SPEED_100)
                 mode |= AX_MEDIUM_PS;
         else
                 mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
@@ -1196,13 +1198,13 @@ static int ax88178_link_reset(struct usbnet *dev)
         else
                 mode &= ~AX_MEDIUM_FD;
 
-        netdev_dbg(dev->net, "ax88178_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",
-                   ecmd.speed, ecmd.duplex, mode);
+        netdev_dbg(dev->net, "ax88178_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
+                   speed, ecmd.duplex, mode);
 
         asix_write_medium_mode(dev, mode);
 
         if (data->phymode == PHY_MODE_MARVELL && data->ledmode)
-                marvell_led_status(dev, ecmd.speed);
+                marvell_led_status(dev, speed);
 
         return 0;
 }
@@ -1508,6 +1510,10 @@ static const struct usb_device_id	products [] = {
         USB_DEVICE (0x0b95, 0x1780),
         .driver_info = (unsigned long) &ax88178_info,
 }, {
+        // Logitec LAN-GTJ/U2A
+        USB_DEVICE (0x0789, 0x0160),
+        .driver_info = (unsigned long) &ax88178_info,
+}, {
         // Linksys USB200M Rev 2
         USB_DEVICE (0x13b1, 0x0018),
         .driver_info = (unsigned long) &ax88772_info,