Merge remote-tracking branch 'fork/master'

wget · Dec 9, 2022 · 315a120 · 315a120
2 parents 6ffb376 + 0029747
commit 315a120
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/r8152.c b/r8152.c
@@ -17558,7 +17558,6 @@ static void r8156_init(struct r8152 *tp)
 //		break;
 //	}
 
-
 	r8153b_mcu_spdown_en(tp, false);
 
 	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS);
@@ -18339,7 +18338,6 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
 		cmd->autoneg = AUTONEG_DISABLE;
 	}
 
-
 	if (netif_running(netdev) && netif_carrier_ok(netdev)) {
 		u16 speed = rtl8152_get_speed(tp);
 
@@ -19202,7 +19200,6 @@ static int rtltool_ioctl(struct r8152 *tp, struct ifreq *ifr)
 		}
 		break;
 
-
 	case RTLTOOL_USB_OCP_WRITE_DWORD:
 		if (!tp->rtk_enable_diag && net_ratelimit())
 			netif_warn(tp, drv, netdev,
@@ -20708,10 +20705,14 @@ static int rtl8152_probe(struct usb_interface *intf,
 
 	usb_set_intfdata(intf, tp);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
 	if (tp->support_2500full)
 		netif_napi_add(netdev, &tp->napi, r8152_poll, 256);
 	else
 		netif_napi_add(netdev, &tp->napi, r8152_poll, 64);
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) */
+  netif_napi_add(netdev, &tp->napi, r8152_poll);
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) */
 
 	ret = register_netdev(netdev);
 	if (ret != 0) {