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