diff -Nru r8125-9.007.01/debian/changelog r8125-9.007.01/debian/changelog --- r8125-9.007.01/debian/changelog 2023-01-18 08:04:11.000000000 +0000 +++ r8125-9.007.01/debian/changelog 2023-06-13 07:11:09.000000000 +0000 @@ -1,3 +1,10 @@ +r8125 (9.007.01-3ubuntu0.2) jammy; urgency=medium + + * Support Linux 6.2 (LP: #2023620): + - debian/patches/linux6.1.patch + + -- Andrea Righi Tue, 13 Jun 2023 07:11:09 +0000 + r8125 (9.007.01-3ubuntu0.1) jammy; urgency=medium * Support linux >= 5.18 (LP: #1981993): diff -Nru r8125-9.007.01/debian/patches/linux6.1.patch r8125-9.007.01/debian/patches/linux6.1.patch --- r8125-9.007.01/debian/patches/linux6.1.patch 1970-01-01 00:00:00.000000000 +0000 +++ r8125-9.007.01/debian/patches/linux6.1.patch 2023-06-13 07:11:09.000000000 +0000 @@ -0,0 +1,23 @@ +Description: Patch for > Linux6.1 + As Linux upstraem changes to use netif_napi_add_weight() > 6.1, + we should define it as. + See https://patchwork.kernel.org/project/linux-wireless/patch/20220927132753.750069-1-kuba@kernel.org/ +Author: Hideki Yamane +Forwarded: nicfae@realtek.com + +Index: r8125-9.007.01/src/r8125.h +=================================================================== +--- r8125-9.007.01.orig/src/r8125.h ++++ r8125-9.007.01/src/r8125.h +@@ -616,7 +616,11 @@ typedef int *napi_budget; + typedef struct napi_struct *napi_ptr; + typedef int napi_budget; + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(6,1,0) ++#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight) ++#else + #define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight) ++#endif + #define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget) + #define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr) + #define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev; diff -Nru r8125-9.007.01/debian/patches/series r8125-9.007.01/debian/patches/series --- r8125-9.007.01/debian/patches/series 2023-01-18 08:04:11.000000000 +0000 +++ r8125-9.007.01/debian/patches/series 2023-06-13 07:11:09.000000000 +0000 @@ -1 +1,2 @@ 0001-support-linux-5.19.patch +linux6.1.patch