1 files changed, 17 insertions, 18 deletions

diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index f56dec6119c3..dd8a4adf48ca 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -22,6 +22,7 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/workqueue.h>
+#include <linux/slab.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
@@ -57,8 +58,8 @@
  */
 void rndis_status(struct usbnet *dev, struct urb *urb)
 {
-        devdbg(dev, "rndis status urb, len %d stat %d",
-                urb->actual_length, urb->status);
+        netdev_dbg(dev->net, "rndis status urb, len %d stat %d\n",
+                   urb->actual_length, urb->status);
         // FIXME for keepalives, respond immediately (asynchronously)
         // if not an RNDIS status, do like cdc_status(dev,urb) does
 }
@@ -114,8 +115,8 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen)
          */
 
         /* Issue the request; xid is unique, don't bother byteswapping it */
-        if (likely(buf->msg_type != RNDIS_MSG_HALT
-                        && buf->msg_type != RNDIS_MSG_RESET)) {
+        if (likely(buf->msg_type != RNDIS_MSG_HALT &&
+                   buf->msg_type != RNDIS_MSG_RESET)) {
                 xid = dev->xid++;
                 if (!xid)
                         xid = dev->xid++;
@@ -335,8 +336,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
 
         dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1);
         if (dev->maxpacket == 0) {
-                if (netif_msg_probe(dev))
-                        dev_dbg(&intf->dev, "dev->maxpacket can't be 0\n");
+                netif_dbg(dev, probe, dev->net,
+                          "dev->maxpacket can't be 0\n");
                 retval = -EINVAL;
                 goto fail_and_release;
         }
@@ -394,17 +395,15 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
         }
         if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&
                         *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
-                if (netif_msg_probe(dev))
-                        dev_dbg(&intf->dev, "driver requires wireless "
-                                "physical medium, but device is not.\n");
+                netif_dbg(dev, probe, dev->net,
+                          "driver requires wireless physical medium, but device is not\n");
                 retval = -ENODEV;
                 goto halt_fail_and_release;
         }
         if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) &&
                         *phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
-                if (netif_msg_probe(dev))
-                        dev_dbg(&intf->dev, "driver requires non-wireless "
-                                "physical medium, but device is wireless.\n");
+                netif_dbg(dev, probe, dev->net,
+                          "driver requires non-wireless physical medium, but device is wireless.\n");
                 retval = -ENODEV;
                 goto halt_fail_and_release;
         }
@@ -493,13 +492,13 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                 data_len = le32_to_cpu(hdr->data_len);
 
                 /* don't choke if we see oob, per-packet data, etc */
-                if (unlikely(hdr->msg_type != RNDIS_MSG_PACKET
-                                || skb->len < msg_len
-                                || (data_offset + data_len + 8) > msg_len)) {
+                if (unlikely(hdr->msg_type != RNDIS_MSG_PACKET ||
+                             skb->len < msg_len ||
+                             (data_offset + data_len + 8) > msg_len)) {
                         dev->net->stats.rx_frame_errors++;
-                        devdbg(dev, "bad rndis message %d/%d/%d/%d, len %d",
-                                le32_to_cpu(hdr->msg_type),
-                                msg_len, data_offset, data_len, skb->len);
+                        netdev_dbg(dev->net, "bad rndis message %d/%d/%d/%d, len %d\n",
+                                   le32_to_cpu(hdr->msg_type),
+                                   msg_len, data_offset, data_len, skb->len);
                         return 0;
                 }
                 skb_pull(skb, 8 + data_offset);