1 files changed, 142 insertions, 137 deletions

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index c6c922247d05..3135af63d378 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -28,6 +28,7 @@
 #include <linux/usb.h>
 #include <linux/crc32.h>
 #include <linux/usb/usbnet.h>
+#include <linux/slab.h>
 #include "smsc95xx.h"
 
 #define SMSC_CHIPNAME                   "smsc95xx"
@@ -78,7 +79,7 @@ static int smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data)
                 00, index, buf, 4, USB_CTRL_GET_TIMEOUT);
 
         if (unlikely(ret < 0))
-                devwarn(dev, "Failed to read register index 0x%08x", index);
+                netdev_warn(dev->net, "Failed to read register index 0x%08x\n", index);
 
         le32_to_cpus(buf);
         *data = *buf;
@@ -106,7 +107,7 @@ static int smsc95xx_write_reg(struct usbnet *dev, u32 index, u32 data)
                 00, index, buf, 4, USB_CTRL_SET_TIMEOUT);
 
         if (unlikely(ret < 0))
-                devwarn(dev, "Failed to write register index 0x%08x", index);
+                netdev_warn(dev->net, "Failed to write register index 0x%08x\n", index);
 
         kfree(buf);
 
@@ -138,7 +139,7 @@ static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
 
         /* confirm MII not busy */
         if (smsc95xx_phy_wait_not_busy(dev)) {
-                devwarn(dev, "MII is busy in smsc95xx_mdio_read");
+                netdev_warn(dev->net, "MII is busy in smsc95xx_mdio_read\n");
                 mutex_unlock(&dev->phy_mutex);
                 return -EIO;
         }
@@ -150,7 +151,7 @@ static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
         smsc95xx_write_reg(dev, MII_ADDR, addr);
 
         if (smsc95xx_phy_wait_not_busy(dev)) {
-                devwarn(dev, "Timed out reading MII reg %02X", idx);
+                netdev_warn(dev->net, "Timed out reading MII reg %02X\n", idx);
                 mutex_unlock(&dev->phy_mutex);
                 return -EIO;
         }
@@ -172,7 +173,7 @@ static void smsc95xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
 
         /* confirm MII not busy */
         if (smsc95xx_phy_wait_not_busy(dev)) {
-                devwarn(dev, "MII is busy in smsc95xx_mdio_write");
+                netdev_warn(dev->net, "MII is busy in smsc95xx_mdio_write\n");
                 mutex_unlock(&dev->phy_mutex);
                 return;
         }
@@ -187,7 +188,7 @@ static void smsc95xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
         smsc95xx_write_reg(dev, MII_ADDR, addr);
 
         if (smsc95xx_phy_wait_not_busy(dev))
-                devwarn(dev, "Timed out writing MII reg %02X", idx);
+                netdev_warn(dev->net, "Timed out writing MII reg %02X\n", idx);
 
         mutex_unlock(&dev->phy_mutex);
 }
@@ -205,7 +206,7 @@ static int smsc95xx_wait_eeprom(struct usbnet *dev)
         } while (!time_after(jiffies, start_time + HZ));
 
         if (val & (E2P_CMD_TIMEOUT_ | E2P_CMD_BUSY_)) {
-                devwarn(dev, "EEPROM read operation timeout");
+                netdev_warn(dev->net, "EEPROM read operation timeout\n");
                 return -EIO;
         }
 
@@ -226,7 +227,7 @@ static int smsc95xx_eeprom_confirm_not_busy(struct usbnet *dev)
                 udelay(40);
         } while (!time_after(jiffies, start_time + HZ));
 
-        devwarn(dev, "EEPROM is busy");
+        netdev_warn(dev->net, "EEPROM is busy\n");
         return -EIO;
 }
 
@@ -308,7 +309,7 @@ static void smsc95xx_async_cmd_callback(struct urb *urb)
         int status = urb->status;
 
         if (status < 0)
-                devwarn(dev, "async callback failed with %d", status);
+                netdev_warn(dev->net, "async callback failed with %d\n", status);
 
         kfree(usb_context);
         usb_free_urb(urb);
@@ -323,13 +324,13 @@ static int smsc95xx_write_reg_async(struct usbnet *dev, u16 index, u32 *data)
 
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                devwarn(dev, "Error allocating URB");
+                netdev_warn(dev->net, "Error allocating URB\n");
                 return -ENOMEM;
         }
 
         usb_context = kmalloc(sizeof(struct usb_context), GFP_ATOMIC);
         if (usb_context == NULL) {
-                devwarn(dev, "Error allocating control msg");
+                netdev_warn(dev->net, "Error allocating control msg\n");
                 usb_free_urb(urb);
                 return -ENOMEM;
         }
@@ -348,7 +349,8 @@ static int smsc95xx_write_reg_async(struct usbnet *dev, u16 index, u32 *data)
 
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status < 0) {
-                devwarn(dev, "Error submitting control msg, sts=%d", status);
+                netdev_warn(dev->net, "Error submitting control msg, sts=%d\n",
+                            status);
                 kfree(usb_context);
                 usb_free_urb(urb);
         }
@@ -375,46 +377,32 @@ static void smsc95xx_set_multicast(struct net_device *netdev)
         spin_lock_irqsave(&pdata->mac_cr_lock, flags);
 
         if (dev->net->flags & IFF_PROMISC) {
-                if (netif_msg_drv(dev))
-                        devdbg(dev, "promiscuous mode enabled");
+                netif_dbg(dev, drv, dev->net, "promiscuous mode enabled\n");
                 pdata->mac_cr |= MAC_CR_PRMS_;
                 pdata->mac_cr &= ~(MAC_CR_MCPAS_ | MAC_CR_HPFILT_);
         } else if (dev->net->flags & IFF_ALLMULTI) {
-                if (netif_msg_drv(dev))
-                        devdbg(dev, "receive all multicast enabled");
+                netif_dbg(dev, drv, dev->net, "receive all multicast enabled\n");
                 pdata->mac_cr |= MAC_CR_MCPAS_;
                 pdata->mac_cr &= ~(MAC_CR_PRMS_ | MAC_CR_HPFILT_);
-        } else if (dev->net->mc_count > 0) {
-                struct dev_mc_list *mc_list = dev->net->mc_list;
-                int count = 0;
+        } else if (!netdev_mc_empty(dev->net)) {
+                struct dev_mc_list *mc_list;
 
                 pdata->mac_cr |= MAC_CR_HPFILT_;
                 pdata->mac_cr &= ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_);
 
-                while (mc_list) {
-                        count++;
-                        if (mc_list->dmi_addrlen == ETH_ALEN) {
-                                u32 bitnum = smsc95xx_hash(mc_list->dmi_addr);
-                                u32 mask = 0x01 << (bitnum & 0x1F);
-                                if (bitnum & 0x20)
-                                        hash_hi |= mask;
-                                else
-                                        hash_lo |= mask;
-                        } else {
-                                devwarn(dev, "dmi_addrlen != 6");
-                        }
-                        mc_list = mc_list->next;
+                netdev_for_each_mc_addr(mc_list, netdev) {
+                        u32 bitnum = smsc95xx_hash(mc_list->dmi_addr);
+                        u32 mask = 0x01 << (bitnum & 0x1F);
+                        if (bitnum & 0x20)
+                                hash_hi |= mask;
+                        else
+                                hash_lo |= mask;
                 }
 
-                if (count != ((u32)dev->net->mc_count))
-                        devwarn(dev, "mc_count != dev->mc_count");
-
-                if (netif_msg_drv(dev))
-                        devdbg(dev, "HASHH=0x%08X, HASHL=0x%08X", hash_hi,
-                                hash_lo);
+                netif_dbg(dev, drv, dev->net, "HASHH=0x%08X, HASHL=0x%08X\n",
+                                   hash_hi, hash_lo);
         } else {
-                if (netif_msg_drv(dev))
-                        devdbg(dev, "receive own packets only");
+                netif_dbg(dev, drv, dev->net, "receive own packets only\n");
                 pdata->mac_cr &=
                         ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_ | MAC_CR_HPFILT_);
         }
@@ -434,7 +422,7 @@ static void smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex,
 
         int ret = smsc95xx_read_reg(dev, AFC_CFG, &afc_cfg);
         if (ret < 0) {
-                devwarn(dev, "error reading AFC_CFG");
+                netdev_warn(dev->net, "error reading AFC_CFG\n");
                 return;
         }
 
@@ -451,13 +439,11 @@ static void smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex,
                 else
                         afc_cfg &= ~0xF;
 
-                if (netif_msg_link(dev))
-                        devdbg(dev, "rx pause %s, tx pause %s",
-                                (cap & FLOW_CTRL_RX ? "enabled" : "disabled"),
-                                (cap & FLOW_CTRL_TX ? "enabled" : "disabled"));
+                netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n",
+                                   cap & FLOW_CTRL_RX ? "enabled" : "disabled",
+                                   cap & FLOW_CTRL_TX ? "enabled" : "disabled");
         } else {
-                if (netif_msg_link(dev))
-                        devdbg(dev, "half duplex");
+                netif_dbg(dev, link, dev->net, "half duplex\n");
                 flow = 0;
                 afc_cfg |= 0xF;
         }
@@ -485,9 +471,8 @@ static int smsc95xx_link_reset(struct usbnet *dev)
         lcladv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);
         rmtadv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
 
-        if (netif_msg_link(dev))
-                devdbg(dev, "speed: %d duplex: %d lcladv: %04x rmtadv: %04x",
-                        ecmd.speed, ecmd.duplex, lcladv, rmtadv);
+        netif_dbg(dev, link, dev->net, "speed: %d duplex: %d lcladv: %04x rmtadv: %04x\n",
+                  ecmd.speed, ecmd.duplex, lcladv, rmtadv);
 
         spin_lock_irqsave(&pdata->mac_cr_lock, flags);
         if (ecmd.duplex != DUPLEX_FULL) {
@@ -511,20 +496,21 @@ static void smsc95xx_status(struct usbnet *dev, struct urb *urb)
         u32 intdata;
 
         if (urb->actual_length != 4) {
-                devwarn(dev, "unexpected urb length %d", urb->actual_length);
+                netdev_warn(dev->net, "unexpected urb length %d\n",
+                            urb->actual_length);
                 return;
         }
 
         memcpy(&intdata, urb->transfer_buffer, 4);
         le32_to_cpus(&intdata);
 
-        if (netif_msg_link(dev))
-                devdbg(dev, "intdata: 0x%08X", intdata);
+        netif_dbg(dev, link, dev->net, "intdata: 0x%08X\n", intdata);
 
         if (intdata & INT_ENP_PHY_INT_)
                 usbnet_defer_kevent(dev, EVENT_LINK_RESET);
         else
-                devwarn(dev, "unexpected interrupt, intdata=0x%08X", intdata);
+                netdev_warn(dev->net, "unexpected interrupt, intdata=0x%08X\n",
+                            intdata);
 }
 
 /* Enable or disable Tx & Rx checksum offload engines */
@@ -534,7 +520,7 @@ static int smsc95xx_set_csums(struct usbnet *dev)
         u32 read_buf;
         int ret = smsc95xx_read_reg(dev, COE_CR, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read COE_CR: %d", ret);
+                netdev_warn(dev->net, "Failed to read COE_CR: %d\n", ret);
                 return ret;
         }
 
@@ -550,12 +536,11 @@ static int smsc95xx_set_csums(struct usbnet *dev)
 
         ret = smsc95xx_write_reg(dev, COE_CR, read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write COE_CR: %d", ret);
+                netdev_warn(dev->net, "Failed to write COE_CR: %d\n", ret);
                 return ret;
         }
 
-        if (netif_msg_hw(dev))
-                devdbg(dev, "COE_CR = 0x%08x", read_buf);
+        netif_dbg(dev, hw, dev->net, "COE_CR = 0x%08x\n", read_buf);
         return 0;
 }
 
@@ -580,8 +565,8 @@ static int smsc95xx_ethtool_set_eeprom(struct net_device *netdev,
         struct usbnet *dev = netdev_priv(netdev);
 
         if (ee->magic != LAN95XX_EEPROM_MAGIC) {
-                devwarn(dev, "EEPROM: magic value mismatch, magic = 0x%x",
-                        ee->magic);
+                netdev_warn(dev->net, "EEPROM: magic value mismatch, magic = 0x%x\n",
+                            ee->magic);
                 return -EINVAL;
         }
 
@@ -659,16 +644,14 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
                         dev->net->dev_addr) == 0) {
                 if (is_valid_ether_addr(dev->net->dev_addr)) {
                         /* eeprom values are valid so use them */
-                        if (netif_msg_ifup(dev))
-                                devdbg(dev, "MAC address read from EEPROM");
+                        netif_dbg(dev, ifup, dev->net, "MAC address read from EEPROM\n");
                         return;
                 }
         }
 
         /* no eeprom, or eeprom values are invalid. generate random MAC */
         random_ether_addr(dev->net->dev_addr);
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "MAC address set to random_ether_addr");
+        netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n");
 }
 
 static int smsc95xx_set_mac_address(struct usbnet *dev)
@@ -680,13 +663,13 @@ static int smsc95xx_set_mac_address(struct usbnet *dev)
 
         ret = smsc95xx_write_reg(dev, ADDRL, addr_lo);
         if (ret < 0) {
-                devwarn(dev, "Failed to write ADDRL: %d", ret);
+                netdev_warn(dev->net, "Failed to write ADDRL: %d\n", ret);
                 return ret;
         }
 
         ret = smsc95xx_write_reg(dev, ADDRH, addr_hi);
         if (ret < 0) {
-                devwarn(dev, "Failed to write ADDRH: %d", ret);
+                netdev_warn(dev->net, "Failed to write ADDRH: %d\n", ret);
                 return ret;
         }
 
@@ -727,6 +710,8 @@ static void smsc95xx_start_rx_path(struct usbnet *dev)
 
 static int smsc95xx_phy_initialize(struct usbnet *dev)
 {
+        int bmcr, timeout = 0;
+
         /* Initialize MII structure */
         dev->mii.dev = dev->net;
         dev->mii.mdio_read = smsc95xx_mdio_read;
@@ -735,7 +720,20 @@ static int smsc95xx_phy_initialize(struct usbnet *dev)
         dev->mii.reg_num_mask = 0x1f;
         dev->mii.phy_id = SMSC95XX_INTERNAL_PHY_ID;
 
+        /* reset phy and wait for reset to complete */
         smsc95xx_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+
+        do {
+                msleep(10);
+                bmcr = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMCR);
+                timeout++;
+        } while ((bmcr & MII_BMCR) && (timeout < 100));
+
+        if (timeout >= 100) {
+                netdev_warn(dev->net, "timeout on PHY Reset");
+                return -EIO;
+        }
+
         smsc95xx_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
                 ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
                 ADVERTISE_PAUSE_ASYM);
@@ -747,8 +745,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev)
                 PHY_INT_MASK_DEFAULT_);
         mii_nway_restart(&dev->mii);
 
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "phy initialised succesfully");
+        netif_dbg(dev, ifup, dev->net, "phy initialised successfully\n");
         return 0;
 }
 
@@ -759,14 +756,13 @@ static int smsc95xx_reset(struct usbnet *dev)
         u32 read_buf, write_buf, burst_cap;
         int ret = 0, timeout;
 
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "entering smsc95xx_reset");
+        netif_dbg(dev, ifup, dev->net, "entering smsc95xx_reset\n");
 
         write_buf = HW_CFG_LRST_;
         ret = smsc95xx_write_reg(dev, HW_CFG, write_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write HW_CFG_LRST_ bit in HW_CFG "
-                        "register, ret = %d", ret);
+                netdev_warn(dev->net, "Failed to write HW_CFG_LRST_ bit in HW_CFG register, ret = %d\n",
+                            ret);
                 return ret;
         }
 
@@ -774,7 +770,7 @@ static int smsc95xx_reset(struct usbnet *dev)
         do {
                 ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
                 if (ret < 0) {
-                        devwarn(dev, "Failed to read HW_CFG: %d", ret);
+                        netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
                         return ret;
                 }
                 msleep(10);
@@ -782,14 +778,14 @@ static int smsc95xx_reset(struct usbnet *dev)
         } while ((read_buf & HW_CFG_LRST_) && (timeout < 100));
 
         if (timeout >= 100) {
-                devwarn(dev, "timeout waiting for completion of Lite Reset");
+                netdev_warn(dev->net, "timeout waiting for completion of Lite Reset\n");
                 return ret;
         }
 
         write_buf = PM_CTL_PHY_RST_;
         ret = smsc95xx_write_reg(dev, PM_CTRL, write_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write PM_CTRL: %d", ret);
+                netdev_warn(dev->net, "Failed to write PM_CTRL: %d\n", ret);
                 return ret;
         }
 
@@ -797,7 +793,7 @@ static int smsc95xx_reset(struct usbnet *dev)
         do {
                 ret = smsc95xx_read_reg(dev, PM_CTRL, &read_buf);
                 if (ret < 0) {
-                        devwarn(dev, "Failed to read PM_CTRL: %d", ret);
+                        netdev_warn(dev->net, "Failed to read PM_CTRL: %d\n", ret);
                         return ret;
                 }
                 msleep(10);
@@ -805,7 +801,7 @@ static int smsc95xx_reset(struct usbnet *dev)
         } while ((read_buf & PM_CTL_PHY_RST_) && (timeout < 100));
 
         if (timeout >= 100) {
-                devwarn(dev, "timeout waiting for PHY Reset");
+                netdev_warn(dev->net, "timeout waiting for PHY Reset\n");
                 return ret;
         }
 
@@ -815,35 +811,35 @@ static int smsc95xx_reset(struct usbnet *dev)
         if (ret < 0)
                 return ret;
 
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "MAC Address: %pM", dev->net->dev_addr);
+        netif_dbg(dev, ifup, dev->net,
+                  "MAC Address: %pM\n", dev->net->dev_addr);
 
         ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read HW_CFG: %d", ret);
+                netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
                 return ret;
         }
 
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "Read Value from HW_CFG : 0x%08x", read_buf);
+        netif_dbg(dev, ifup, dev->net,
+                  "Read Value from HW_CFG : 0x%08x\n", read_buf);
 
         read_buf |= HW_CFG_BIR_;
 
         ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write HW_CFG_BIR_ bit in HW_CFG "
-                        "register, ret = %d", ret);
+                netdev_warn(dev->net, "Failed to write HW_CFG_BIR_ bit in HW_CFG register, ret = %d\n",
+                            ret);
                 return ret;
         }
 
         ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read HW_CFG: %d", ret);
+                netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
                 return ret;
         }
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "Read Value from HW_CFG after writing "
-                        "HW_CFG_BIR_: 0x%08x", read_buf);
+        netif_dbg(dev, ifup, dev->net,
+                  "Read Value from HW_CFG after writing HW_CFG_BIR_: 0x%08x\n",
+                  read_buf);
 
         if (!turbo_mode) {
                 burst_cap = 0;
@@ -856,47 +852,47 @@ static int smsc95xx_reset(struct usbnet *dev)
                 dev->rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;
         }
 
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "rx_urb_size=%ld", (ulong)dev->rx_urb_size);
+        netif_dbg(dev, ifup, dev->net,
+                  "rx_urb_size=%ld\n", (ulong)dev->rx_urb_size);
 
         ret = smsc95xx_write_reg(dev, BURST_CAP, burst_cap);
         if (ret < 0) {
-                devwarn(dev, "Failed to write BURST_CAP: %d", ret);
+                netdev_warn(dev->net, "Failed to write BURST_CAP: %d\n", ret);
                 return ret;
         }
 
         ret = smsc95xx_read_reg(dev, BURST_CAP, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read BURST_CAP: %d", ret);
+                netdev_warn(dev->net, "Failed to read BURST_CAP: %d\n", ret);
                 return ret;
         }
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "Read Value from BURST_CAP after writing: 0x%08x",
-                        read_buf);
+        netif_dbg(dev, ifup, dev->net,
+                  "Read Value from BURST_CAP after writing: 0x%08x\n",
+                  read_buf);
 
         read_buf = DEFAULT_BULK_IN_DELAY;
         ret = smsc95xx_write_reg(dev, BULK_IN_DLY, read_buf);
         if (ret < 0) {
-                devwarn(dev, "ret = %d", ret);
+                netdev_warn(dev->net, "ret = %d\n", ret);
                 return ret;
         }
 
         ret = smsc95xx_read_reg(dev, BULK_IN_DLY, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read BULK_IN_DLY: %d", ret);
+                netdev_warn(dev->net, "Failed to read BULK_IN_DLY: %d\n", ret);
                 return ret;
         }
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "Read Value from BULK_IN_DLY after writing: "
-                        "0x%08x", read_buf);
+        netif_dbg(dev, ifup, dev->net,
+                  "Read Value from BULK_IN_DLY after writing: 0x%08x\n",
+                  read_buf);
 
         ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read HW_CFG: %d", ret);
+                netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
                 return ret;
         }
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "Read Value from HW_CFG: 0x%08x", read_buf);
+        netif_dbg(dev, ifup, dev->net,
+                  "Read Value from HW_CFG: 0x%08x\n", read_buf);
 
         if (turbo_mode)
                 read_buf |= (HW_CFG_MEF_ | HW_CFG_BCE_);
@@ -908,41 +904,41 @@ static int smsc95xx_reset(struct usbnet *dev)
 
         ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write HW_CFG register, ret=%d", ret);
+                netdev_warn(dev->net, "Failed to write HW_CFG register, ret=%d\n",
+                            ret);
                 return ret;
         }
 
         ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read HW_CFG: %d", ret);
+                netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
                 return ret;
         }
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "Read Value from HW_CFG after writing: 0x%08x",
-                        read_buf);
+        netif_dbg(dev, ifup, dev->net,
+                  "Read Value from HW_CFG after writing: 0x%08x\n", read_buf);
 
         write_buf = 0xFFFFFFFF;
         ret = smsc95xx_write_reg(dev, INT_STS, write_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write INT_STS register, ret=%d", ret);
+                netdev_warn(dev->net, "Failed to write INT_STS register, ret=%d\n",
+                            ret);
                 return ret;
         }
 
         ret = smsc95xx_read_reg(dev, ID_REV, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read ID_REV: %d", ret);
+                netdev_warn(dev->net, "Failed to read ID_REV: %d\n", ret);
                 return ret;
         }
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "ID_REV = 0x%08x", read_buf);
+        netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", read_buf);
 
         /* Configure GPIO pins as LED outputs */
         write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED |
                 LED_GPIO_CFG_FDX_LED;
         ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write LED_GPIO_CFG register, ret=%d",
-                        ret);
+                netdev_warn(dev->net, "Failed to write LED_GPIO_CFG register, ret=%d\n",
+                            ret);
                 return ret;
         }
 
@@ -950,21 +946,21 @@ static int smsc95xx_reset(struct usbnet *dev)
         write_buf = 0;
         ret = smsc95xx_write_reg(dev, FLOW, write_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write FLOW: %d", ret);
+                netdev_warn(dev->net, "Failed to write FLOW: %d\n", ret);
                 return ret;
         }
 
         read_buf = AFC_CFG_DEFAULT;
         ret = smsc95xx_write_reg(dev, AFC_CFG, read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write AFC_CFG: %d", ret);
+                netdev_warn(dev->net, "Failed to write AFC_CFG: %d\n", ret);
                 return ret;
         }
 
         /* Don't need mac_cr_lock during initialisation */
         ret = smsc95xx_read_reg(dev, MAC_CR, &pdata->mac_cr);
         if (ret < 0) {
-                devwarn(dev, "Failed to read MAC_CR: %d", ret);
+                netdev_warn(dev->net, "Failed to read MAC_CR: %d\n", ret);
                 return ret;
         }
 
@@ -973,7 +969,7 @@ static int smsc95xx_reset(struct usbnet *dev)
         write_buf = (u32)ETH_P_8021Q;
         ret = smsc95xx_write_reg(dev, VLAN1, write_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write VAN1: %d", ret);
+                netdev_warn(dev->net, "Failed to write VAN1: %d\n", ret);
                 return ret;
         }
 
@@ -981,7 +977,7 @@ static int smsc95xx_reset(struct usbnet *dev)
         ethtool_op_set_tx_hw_csum(netdev, pdata->use_tx_csum);
         ret = smsc95xx_set_csums(dev);
         if (ret < 0) {
-                devwarn(dev, "Failed to set csum offload: %d", ret);
+                netdev_warn(dev->net, "Failed to set csum offload: %d\n", ret);
                 return ret;
         }
 
@@ -992,7 +988,7 @@ static int smsc95xx_reset(struct usbnet *dev)
 
         ret = smsc95xx_read_reg(dev, INT_EP_CTL, &read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to read INT_EP_CTL: %d", ret);
+                netdev_warn(dev->net, "Failed to read INT_EP_CTL: %d\n", ret);
                 return ret;
         }
 
@@ -1001,15 +997,14 @@ static int smsc95xx_reset(struct usbnet *dev)
 
         ret = smsc95xx_write_reg(dev, INT_EP_CTL, read_buf);
         if (ret < 0) {
-                devwarn(dev, "Failed to write INT_EP_CTL: %d", ret);
+                netdev_warn(dev->net, "Failed to write INT_EP_CTL: %d\n", ret);
                 return ret;
         }
 
         smsc95xx_start_tx_path(dev);
         smsc95xx_start_rx_path(dev);
 
-        if (netif_msg_ifup(dev))
-                devdbg(dev, "smsc95xx_reset, return 0");
+        netif_dbg(dev, ifup, dev->net, "smsc95xx_reset, return 0\n");
         return 0;
 }
 
@@ -1034,7 +1029,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
 
         ret = usbnet_get_endpoints(dev, intf);
         if (ret < 0) {
-                devwarn(dev, "usbnet_get_endpoints failed: %d", ret);
+                netdev_warn(dev->net, "usbnet_get_endpoints failed: %d\n", ret);
                 return ret;
         }
 
@@ -1043,7 +1038,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
 
         pdata = (struct smsc95xx_priv *)(dev->data[0]);
         if (!pdata) {
-                devwarn(dev, "Unable to allocate struct smsc95xx_priv");
+                netdev_warn(dev->net, "Unable to allocate struct smsc95xx_priv\n");
                 return -ENOMEM;
         }
 
@@ -1066,8 +1061,7 @@ static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf)
 {
         struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
         if (pdata) {
-                if (netif_msg_ifdown(dev))
-                        devdbg(dev, "free pdata");
+                netif_dbg(dev, ifdown, dev->net, "free pdata\n");
                 kfree(pdata);
                 pdata = NULL;
                 dev->data[0] = 0;
@@ -1101,8 +1095,8 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                 align_count = (4 - ((size + NET_IP_ALIGN) % 4)) % 4;
 
                 if (unlikely(header & RX_STS_ES_)) {
-                        if (netif_msg_rx_err(dev))
-                                devdbg(dev, "Error header=0x%08x", header);
+                        netif_dbg(dev, rx_err, dev->net,
+                                  "Error header=0x%08x\n", header);
                         dev->net->stats.rx_errors++;
                         dev->net->stats.rx_dropped++;
 
@@ -1119,9 +1113,8 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                 } else {
                         /* ETH_FRAME_LEN + 4(CRC) + 2(COE) + 4(Vlan) */
                         if (unlikely(size > (ETH_FRAME_LEN + 12))) {
-                                if (netif_msg_rx_err(dev))
-                                        devdbg(dev, "size err header=0x%08x",
-                                                header);
+                                netif_dbg(dev, rx_err, dev->net,
+                                          "size err header=0x%08x\n", header);
                                 return 0;
                         }
 
@@ -1137,7 +1130,7 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 
                         ax_skb = skb_clone(skb, GFP_ATOMIC);
                         if (unlikely(!ax_skb)) {
-                                devwarn(dev, "Error allocating skb");
+                                netdev_warn(dev->net, "Error allocating skb\n");
                                 return 0;
                         }
 
@@ -1161,7 +1154,7 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
         }
 
         if (unlikely(skb->len < 0)) {
-                devwarn(dev, "invalid rx length<0 %d", skb->len);
+                netdev_warn(dev->net, "invalid rx length<0 %d\n", skb->len);
                 return 0;
         }
 
@@ -1197,9 +1190,21 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev,
         }
 
         if (csum) {
-                u32 csum_preamble = smsc95xx_calc_csum_preamble(skb);
-                skb_push(skb, 4);
-                memcpy(skb->data, &csum_preamble, 4);
+                if (skb->len <= 45) {
+                        /* workaround - hardware tx checksum does not work
+                         * properly with extremely small packets */
+                        long csstart = skb->csum_start - skb_headroom(skb);
+                        __wsum calc = csum_partial(skb->data + csstart,
+                                skb->len - csstart, 0);
+                        *((__sum16 *)(skb->data + csstart
+                                + skb->csum_offset)) = csum_fold(calc);
+
+                        csum = false;
+                } else {
+                        u32 csum_preamble = smsc95xx_calc_csum_preamble(skb);
+                        skb_push(skb, 4);
+                        memcpy(skb->data, &csum_preamble, 4);
+                }
         }
 
         skb_push(skb, 4);