[packages/r8168] - up to 8.052.01

baggins baggins at pld-linux.org
Sun Dec 24 20:34:56 CET 2023


commit 97a3c8981fbb526c6ad3330f015aea74f15b9515
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 24 20:18:30 2023 +0100

    - up to 8.052.01

 kernel-6.1.patch | 14 --------------
 kernel-6.5.patch | 13 -------------
 r8168.spec       |  8 ++------
 3 files changed, 2 insertions(+), 33 deletions(-)
---
diff --git a/r8168.spec b/r8168.spec
index dcbef7d..186f9df 100644
--- a/r8168.spec
+++ b/r8168.spec
@@ -9,7 +9,7 @@
 Summary:	Linux driver for RTL8111/8168B PCI Express Gigabit Ethernet controllers
 Summary(pl.UTF-8):	Linuksowy sterownik dla kart sieciowych RTL8111/8168B PCI Express Gigabit Ethernet
 Name:		%{pname}%{_alt_kernel}
-Version:	8.051.02
+Version:	8.052.01
 Release:	%{rel}%{?_pld_builder:@%{_kernel_ver_str}}
 License:	GPL
 Group:		Base/Kernel
@@ -18,9 +18,7 @@ URL:		http://www.realtek.com.tw/
 # https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
 # unfortunately this download is not DF-friendly.
 Source0:	%{pname}-%{version}.tar.bz2
-# Source0-md5:	c3ca2e48ff5079540153a4ba30b0014a
-Patch0:		kernel-6.1.patch
-Patch1:		kernel-6.5.patch
+# Source0-md5:	31d41df8c9234d187d42b881a087d7df
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
@@ -72,8 +70,6 @@ Express Gigabit Ethernet.\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{expand:%build_kernel_packages}
diff --git a/kernel-6.1.patch b/kernel-6.1.patch
deleted file mode 100644
index 3e65fc9..0000000
--- a/kernel-6.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- r8168-8.049.02/src/r8168.h~	2021-06-11 17:25:16.000000000 +0200
-+++ r8168-8.049.02/src/r8168.h	2022-12-17 19:14:10.556568693 +0100
-@@ -553,7 +553,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(ndev, &priv->napi, function)
-+#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/kernel-6.5.patch b/kernel-6.5.patch
deleted file mode 100644
index 0683a06..0000000
--- a/kernel-6.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- r8168-8.051.02/src/r8168_n.c~	2022-10-20 10:57:18.000000000 +0200
-+++ r8168-8.051.02/src/r8168_n.c	2023-09-06 02:41:32.191684157 +0200
-@@ -81,6 +81,10 @@
- #include <linux/mdio.h>
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,5,0)
-+#include <net/gso.h>
-+#endif
-+
- #include <asm/io.h>
- #include <asm/irq.h>
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/r8168.git/commitdiff/97a3c8981fbb526c6ad3330f015aea74f15b9515



More information about the pld-cvs-commit mailing list