dlink: remove __dev* attributes

[~andy/linux] / drivers / net / virtio_net.c

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index cbf8b06253528e9e5557c31e844581d7334d7e21..26c502e4b871f4168b021739a9497f9dd8b6f640 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -212,8 +212,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
         * the case of a broken device.
         */
        if (unlikely(len > MAX_SKB_FRAGS * PAGE_SIZE)) {
-               if (net_ratelimit())
-                       pr_debug("%s: too much data\n", skb->dev->name);
+               net_dbg_ratelimited("%s: too much data\n", skb->dev->name);
                dev_kfree_skb(skb);
                return NULL;
        }
@@ -333,9 +332,8 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
                        break;
                default:
-                       if (net_ratelimit())
-                               printk(KERN_WARNING "%s: bad gso type %u.\n",
-                                      dev->name, hdr->hdr.gso_type);
+                       net_warn_ratelimited("%s: bad gso type %u.\n",
+                                            dev->name, hdr->hdr.gso_type);
                        goto frame_err;
                }
 
@@ -344,9 +342,7 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
 
                skb_shinfo(skb)->gso_size = hdr->hdr.gso_size;
                if (skb_shinfo(skb)->gso_size == 0) {
-                       if (net_ratelimit())
-                               printk(KERN_WARNING "%s: zero gso size.\n",
-                                      dev->name);
+                       net_warn_ratelimited("%s: zero gso size.\n", dev->name);
                        goto frame_err;
                }