Skip to contentSkip to conversation

net/core: tidy up an error message

PATCH Applied Qian Cai 2 participants 2 messages Dec 2, 2018 – Dec 4, 2018

Subsystems (2)
lore
Share & tools
lore

Qian Cai

author
#0 lore raw

PATCH v2 1/1 net/core: tidy up an error message

netif_napi_add() could report an error like this below due to it allows to pass a format string for wildcarding before calling dev_get_valid_name(),

"netif_napi_add() called with weight 256 on device eth%d"

For example, hns_enet_drv module does this.

hns_nic_try_get_ae
hns_nic_init_ring_data
netif_napi_add
register_netdev
dev_get_valid_name

Hence, make it a bit more human-readable by using netdev_err_once() instead.

---

v2:
* Used netdev_err_once() suggested by Joe.
* Replaced the hard-coded function name with __func__.

 net/core/dev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/dev.c +2 -2
index ddc551f24ba2..65ac80970d1f 100644
@@ -6204,8 +6204,8 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
 	napi->skb = NULL;
 	napi->poll = poll;
 	if (weight > NAPI_POLL_WEIGHT)
-		pr_err_once("netif_napi_add() called with weight %d on device %s\n",
-			    weight, dev->name);
+		netdev_err_once(dev, "%s() called with weight %d\n", __func__,
+				weight);
 	napi->weight = weight;
 	list_add(&napi->dev_list, &dev->napi_list);
 	napi->dev = dev;
Signature · 1 line
2.17.2 (Apple Git-113)
maintainer Applied
#1 lore raw

From: Qian Cai <[email protected]>
Date: Sat, 1 Dec 2018 21:11:19 -0500

Quoted 14 lines

netif_napi_add() could report an error like this below due to it allows to pass a format string for wildcarding before calling dev_get_valid_name(),

"netif_napi_add() called with weight 256 on device eth%d"

For example, hns_enet_drv module does this.

hns_nic_try_get_ae
hns_nic_init_ring_data
netif_napi_add
register_netdev
dev_get_valid_name

Quoted 4 lines

Hence, make it a bit more human-readable by using netdev_err_once() instead.

Applied, thanks.