From 69fdc7ae2e75378d23aa6d3ec6fe84023c01f74b Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 8 Apr 2010 21:26:13 +0000 Subject: [PATCH] --- yaml --- r: 194021 b: refs/heads/master c: 7a161ea92471087a1579239d7a58dd06eaa5601c h: refs/heads/master i: 194019: 0b8c9254016d268e7b3df7402adaa5787a1c5a58 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 960e0bd7d2fd..1a4700a3a0fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0ee7acfcdd4169cee2fefc630de72deb5bc34b9 +refs/heads/master: 7a161ea92471087a1579239d7a58dd06eaa5601c diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index a10a21619ae3..0eb79e35671f 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1987,9 +1987,9 @@ static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index) { if (unlikely(queue_index >= dev->real_num_tx_queues)) { if (net_ratelimit()) { - netdev_warn(dev, "selects TX queue %d, but " - "real number of TX queues is %d\n", - queue_index, dev->real_num_tx_queues); + pr_warning("%s selects TX queue %d, but " + "real number of TX queues is %d\n", + dev->name, queue_index, dev->real_num_tx_queues); } return 0; } @@ -2223,9 +2223,9 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb) u16 index = skb_get_rx_queue(skb); if (unlikely(index >= dev->num_rx_queues)) { if (net_ratelimit()) { - netdev_warn(dev, "received packet on queue " - "%u, but number of RX queues is %u\n", - index, dev->num_rx_queues); + pr_warning("%s received packet on queue " + "%u, but number of RX queues is %u\n", + dev->name, index, dev->num_rx_queues); } goto done; }