Fix support for kernel 6.1 netif_napi_add_weight.

3 files changed, 23 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e68f987bcb4..f00b537acd9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,9 @@ pkgbase = r8125-dkms
 	conflicts = r8125
 	source = http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.011.00.tar.bz2
 	source = dkms.conf
+	source = 6.1.patch
 	sha256sums = 01fbdb249b7ba2984df93a4bd11aecddd1ed904c6be10fc5d776e94b3110b2bf
 	sha256sums = ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f
+	sha256sums = 457d40c5e2e8f2b3436738ece848e52fa0866ba8906240f2e5bee193bf7384a4
 
 pkgname = r8125-dkms
diff --git a/6.1.patch b/6.1.patch
new file mode 100644
index 000000000000..a5a79e7f1f4b
--- /dev/null
+++ b/6.1.patch
@@ -0,0 +1,14 @@
+--- r8125-9.011.00/src/r8125.h
++++ r8125-9.011.00/src/r8125.h
+@@ -676,7 +676,11 @@
+ 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(ndev, &priv->napi, function, weight)
++#else
++#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add_weight(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 --git a/PKGBUILD b/PKGBUILD
index 2638681e4375..33f537f9d340 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,9 +14,14 @@ depends=('dkms')
 conflicts=("${_pkgname}")
 optdepends=('linux-headers: Build the module for Arch kernel'
             'linux-lts-headers: Build the module for LTS Arch kernel')
-source=("http://rtitwww.realtek.com/rtdrivers/cn/nic1/${_pkgname}-${pkgver}.tar.bz2" 'dkms.conf')
+source=("http://rtitwww.realtek.com/rtdrivers/cn/nic1/${_pkgname}-${pkgver}.tar.bz2" 'dkms.conf' '6.1.patch')
 sha256sums=('01fbdb249b7ba2984df93a4bd11aecddd1ed904c6be10fc5d776e94b3110b2bf'
-            'ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f')
+            'ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f'
+            '457d40c5e2e8f2b3436738ece848e52fa0866ba8906240f2e5bee193bf7384a4')
+
+prepare() {
+  patch -Np0 <6.1.patch
+}
 
 package() {
   dir_name="${_pkgname}-${pkgver}"