Skip to contentSkip to conversation

staging: switch to netif_napi_add_weight()

PATCH New Jakub Kicinski 1 participant 1 message Jul 5, 2022 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: switch to netif_napi_add_weight()

netif_napi_add() will soon default to weight of 64 instead of requiring the user to specify that parameter. Most users already pass or should pass 64. Move the callers in staging to netif_napi_add_weight() which will keep the argument. This way we'll avoid a huge cross-tree conversion when argument is removed.

---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 drivers/staging/octeon/ethernet-rx.c | 4 ++--
 drivers/staging/qlge/qlge_main.c     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/octeon/ethernet-rx.c +2 -2
index 9ebd665e5d42..965330eec80a 100644
@@ -469,8 +469,8 @@ void cvm_oct_rx_initialize(void)
 		if (!(pow_receive_groups & BIT(i)))
 			continue;
 
-		netif_napi_add(dev_for_napi, &oct_rx_group[i].napi,
-			       cvm_oct_napi_poll, rx_napi_weight);
+		netif_napi_add_weight(dev_for_napi, &oct_rx_group[i].napi,
+				      cvm_oct_napi_poll, rx_napi_weight);
 		napi_enable(&oct_rx_group[i].napi);
 
 		oct_rx_group[i].irq = OCTEON_IRQ_WORKQ0 + i;
drivers/staging/qlge/qlge_main.c +2 -2
index 6cd7fc9589c3..552b9dba1944 100644
@@ -3041,8 +3041,8 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		/* Inbound completion handling rx_rings run in
 		 * separate NAPI contexts.
 		 */
-		netif_napi_add(qdev->ndev, &rx_ring->napi, qlge_napi_poll_msix,
-			       64);
+		netif_napi_add_weight(qdev->ndev, &rx_ring->napi,
+				      qlge_napi_poll_msix, 64);
 		cqicb->irq_delay = cpu_to_le16(qdev->rx_coalesce_usecs);
 		cqicb->pkt_delay = cpu_to_le16(qdev->rx_max_coalesced_frames);
 	} else {
Signature · 1 line
2.36.1