1 From ecc38cf4248965b95d40a4b1db2e84bf5347054e Mon Sep 17 00:00:00 2001
2 From: Yonglong Liu <liuyonglong@huawei.com>
3 Date: Thu, 4 Apr 2019 16:46:43 +0800
4 Subject: net: hns: Use NAPI_POLL_WEIGHT for hns driver
6 [ Upstream commit acb1ce15a61154aa501891d67ebf79bc9ea26818 ]
8 When the HNS driver loaded, always have an error print:
9 "netif_napi_add() called with weight 256"
11 This is because the kernel checks the NAPI polling weights
12 requested by drivers and it prints an error message if a driver
13 requests a weight bigger than 64.
15 So use NAPI_POLL_WEIGHT to fix it.
17 Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
18 Signed-off-by: Peng Li <lipeng321@huawei.com>
19 Signed-off-by: David S. Miller <davem@davemloft.net>
20 Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
22 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 7 ++-----
23 1 file changed, 2 insertions(+), 5 deletions(-)
25 diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
26 index e5a7c0761dbd..4cd86ba1f050 100644
27 --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
28 +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
31 #define SERVICE_TIMER_HZ (1 * HZ)
33 -#define NIC_TX_CLEAN_MAX_NUM 256
34 -#define NIC_RX_CLEAN_MAX_NUM 64
36 #define RCB_IRQ_NOT_INITED 0
37 #define RCB_IRQ_INITED 1
38 #define HNS_BUFFER_SIZE_2048 2048
39 @@ -2153,7 +2150,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)
40 hns_nic_tx_fini_pro_v2;
42 netif_napi_add(priv->netdev, &rd->napi,
43 - hns_nic_common_poll, NIC_TX_CLEAN_MAX_NUM);
44 + hns_nic_common_poll, NAPI_POLL_WEIGHT);
45 rd->ring->irq_init_flag = RCB_IRQ_NOT_INITED;
47 for (i = h->q_num; i < h->q_num * 2; i++) {
48 @@ -2166,7 +2163,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)
49 hns_nic_rx_fini_pro_v2;
51 netif_napi_add(priv->netdev, &rd->napi,
52 - hns_nic_common_poll, NIC_RX_CLEAN_MAX_NUM);
53 + hns_nic_common_poll, NAPI_POLL_WEIGHT);
54 rd->ring->irq_init_flag = RCB_IRQ_NOT_INITED;