From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 6 May 2022 17:07:49 +0000 (-0700)
Subject: r8152: switch to netif_napi_add_weight()
X-Git-Tag: howlett/maple/20220722_2~466^2~167^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8ded532cd1cbe48461821c605dbad9447555755a;p=users%2Fjedix%2Flinux-maple.git

r8152: switch to netif_napi_add_weight()

r8152 uses a custom napi weight, switch to the new
API for setting custom weight.

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

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index d3b53db57c263..c2da3438387c0 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -9732,10 +9732,8 @@ static int rtl8152_probe(struct usb_interface *intf,
 
 	usb_set_intfdata(intf, tp);
 
-	if (tp->support_2500full)
-		netif_napi_add(netdev, &tp->napi, r8152_poll, 256);
-	else
-		netif_napi_add(netdev, &tp->napi, r8152_poll, 64);
+	netif_napi_add_weight(netdev, &tp->napi, r8152_poll,
+			      tp->support_2500full ? 256 : 64);
 
 	ret = register_netdev(netdev);
 	if (ret != 0) {