aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/rndis_host.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-02-17 05:30:23 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-17 16:35:40 -0500
commit60b86755929e1a7e9038c8d860a8491cfdf8d93a (patch)
tree97062c7136ead4adcdbf2bd3280143da1fabbe20 /drivers/net/usb/rndis_host.c
parent82456b031e3c3b5bf95a7e49bd9b68b146446e76 (diff)
usbnet: Convert dev(dbg|err|warn|info) macros to netdev_<level>
These macros are too similar to the dev_<level> equivalents but take a usbnet * argument. Convert them to the recently introduced netdev_<level> macros and remove the old macros. The old macros had "\n" appended to the format string. Add the "\n" to the converted uses. Some existing uses of the dev<foo> macros in cdc_eem.c probably mistakenly had trailing "\n". No "\n" added there. Fix net1080 this/other log message inversion. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/rndis_host.c')
-rw-r--r--drivers/net/usb/rndis_host.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 490fa8f55424..f01f02401856 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -57,8 +57,8 @@
57 */ 57 */
58void rndis_status(struct usbnet *dev, struct urb *urb) 58void rndis_status(struct usbnet *dev, struct urb *urb)
59{ 59{
60 devdbg(dev, "rndis status urb, len %d stat %d", 60 netdev_dbg(dev->net, "rndis status urb, len %d stat %d\n",
61 urb->actual_length, urb->status); 61 urb->actual_length, urb->status);
62 // FIXME for keepalives, respond immediately (asynchronously) 62 // FIXME for keepalives, respond immediately (asynchronously)
63 // if not an RNDIS status, do like cdc_status(dev,urb) does 63 // if not an RNDIS status, do like cdc_status(dev,urb) does
64} 64}
@@ -497,9 +497,9 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
497 skb->len < msg_len || 497 skb->len < msg_len ||
498 (data_offset + data_len + 8) > msg_len)) { 498 (data_offset + data_len + 8) > msg_len)) {
499 dev->net->stats.rx_frame_errors++; 499 dev->net->stats.rx_frame_errors++;
500 devdbg(dev, "bad rndis message %d/%d/%d/%d, len %d", 500 netdev_dbg(dev->net, "bad rndis message %d/%d/%d/%d, len %d\n",
501 le32_to_cpu(hdr->msg_type), 501 le32_to_cpu(hdr->msg_type),
502 msg_len, data_offset, data_len, skb->len); 502 msg_len, data_offset, data_len, skb->len);
503 return 0; 503 return 0;
504 } 504 }
505 skb_pull(skb, 8 + data_offset); 505 skb_pull(skb, 8 + data_offset);