[PATCH] net/core: tidy up an error message

Qian Cai
2018-12-01T04:51:53Z

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.

Signed-off-by: Qian Cai <cai@gmx.us>
---
net/core/dev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index ddc551f24ba2..bbd7cdbbbebd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6205,7 +6205,8 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
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);
+ weight,
+ !strchr(dev->name, '%') ? dev->name : "unknown");
napi->weight = weight;
list_add(&napi->dev_list, &dev->napi_list);
napi->dev = dev;
--
2.17.2 (Apple Git-113)