Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

eth: remove remaining copies of the NAPI_POLL_WEIGHT define

Defining local versions of NAPI_POLL_WEIGHT with the same
values in the drivers just makes refactoring harder.

This patch covers three more drivers which I missed in
commit 5f012b40ef63 ("eth: remove copies of the NAPI_POLL_WEIGHT define").

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jakub Kicinski and committed by
David S. Miller
36ffca1a 5a8ad1ce

+5 -8
+1 -3
drivers/net/ethernet/amazon/ena/ena_netdev.c
··· 31 31 32 32 #define ENA_MAX_RINGS min_t(unsigned int, ENA_MAX_NUM_IO_QUEUES, num_possible_cpus()) 33 33 34 - #define ENA_NAPI_BUDGET 64 35 - 36 34 #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | \ 37 35 NETIF_MSG_TX_DONE | NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR) 38 36 ··· 2268 2270 netif_napi_add(adapter->netdev, 2269 2271 &napi->napi, 2270 2272 ENA_IS_XDP_INDEX(adapter, i) ? ena_xdp_io_poll : ena_io_poll, 2271 - ENA_NAPI_BUDGET); 2273 + NAPI_POLL_WEIGHT); 2272 2274 2273 2275 if (!ENA_IS_XDP_INDEX(adapter, i)) { 2274 2276 napi->rx_ring = &adapter->rx_ring[i];
+1 -2
drivers/net/ethernet/brocade/bna/bnad.c
··· 1881 1881 return rcvd; 1882 1882 } 1883 1883 1884 - #define BNAD_NAPI_POLL_QUOTA 64 1885 1884 static void 1886 1885 bnad_napi_add(struct bnad *bnad, u32 rx_id) 1887 1886 { ··· 1891 1892 for (i = 0; i < bnad->num_rxp_per_rx; i++) { 1892 1893 rx_ctrl = &bnad->rx_info[rx_id].rx_ctrl[i]; 1893 1894 netif_napi_add(bnad->netdev, &rx_ctrl->napi, 1894 - bnad_napi_poll_rx, BNAD_NAPI_POLL_QUOTA); 1895 + bnad_napi_poll_rx, NAPI_POLL_WEIGHT); 1895 1896 } 1896 1897 } 1897 1898
+3 -3
drivers/net/ethernet/nvidia/forcedeth.c
··· 56 56 57 57 #include <asm/irq.h> 58 58 59 - #define TX_WORK_PER_LOOP 64 60 - #define RX_WORK_PER_LOOP 64 59 + #define TX_WORK_PER_LOOP NAPI_POLL_WEIGHT 60 + #define RX_WORK_PER_LOOP NAPI_POLL_WEIGHT 61 61 62 62 /* 63 63 * Hardware access: ··· 5876 5876 else 5877 5877 dev->netdev_ops = &nv_netdev_ops_optimized; 5878 5878 5879 - netif_napi_add(dev, &np->napi, nv_napi_poll, RX_WORK_PER_LOOP); 5879 + netif_napi_add(dev, &np->napi, nv_napi_poll, NAPI_POLL_WEIGHT); 5880 5880 dev->ethtool_ops = &ops; 5881 5881 dev->watchdog_timeo = NV_WATCHDOG_TIMEO; 5882 5882