[packages/r8168] - up to 8.047.01

[baggins]

commit c9239e715d7237c2f46f11aa6cd627947724aa88
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 7 19:09:50 2019 +0200

    - up to 8.047.01

 kernel-4.15.patch | 83 -------------------------------------------------------
 r8168.spec        |  8 ++----
 2 files changed, 3 insertions(+), 88 deletions(-)
---
diff --git a/r8168.spec b/r8168.spec
index d5b170c..2ceab7a 100644
--- a/r8168.spec
+++ b/r8168.spec
@@ -9,17 +9,16 @@
 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.045.08
+Version:	8.047.01
 Release:	%{rel}%{?_pld_builder:@%{_kernel_ver_str}}
 License:	GPL
 Group:		Base/Kernel
 URL:		http://www.realtek.com.tw/
 # Check for new versions at
-# http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false
+# 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:	474442fe528aee9bbc3c7e9a19debcb5
-Patch0:		kernel-4.15.patch
+# Source0-md5:	1d4e403cf7fa579b1bd02adc33336cbb
 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)
@@ -71,7 +70,6 @@ Express Gigabit Ethernet.\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 %build
 %{expand:%build_kernel_packages}
diff --git a/kernel-4.15.patch b/kernel-4.15.patch
deleted file mode 100644
index f53ab78..0000000
--- a/kernel-4.15.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/src/r8168_n.c b/src/r8168_n.c
-index 4cd540a..2dbb726 100755
---- a/src/r8168_n.c
-+++ b/src/r8168_n.c
-@@ -407,8 +407,14 @@ MODULE_VERSION(RTL8168_VERSION);
- static void rtl8168_sleep_rx_enable(struct net_device *dev);
- static void rtl8168_dsm(struct net_device *dev, int dev_state);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-+static void rtl8168_esd_timer(struct timer_list *timer);
-+static void rtl8168_link_timer(struct timer_list *timer);
-+#else
- static void rtl8168_esd_timer(unsigned long __opaque);
- static void rtl8168_link_timer(unsigned long __opaque);
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-+
- static void rtl8168_tx_clear(struct rtl8168_private *tp);
- static void rtl8168_rx_clear(struct rtl8168_private *tp);
- 
-@@ -22964,7 +22970,11 @@ static inline void rtl8168_request_esd_timer(struct net_device *dev)
-         struct rtl8168_private *tp = netdev_priv(dev);
-         struct timer_list *timer = &tp->esd_timer;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-+        timer_setup(timer, rtl8168_esd_timer, 0);
-+#else
-         setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev);
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-         mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT);
- }
- 
-@@ -22978,7 +22988,11 @@ static inline void rtl8168_request_link_timer(struct net_device *dev)
-         struct rtl8168_private *tp = netdev_priv(dev);
-         struct timer_list *timer = &tp->link_timer;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-+        timer_setup(timer, rtl8168_link_timer, 0);
-+#else
-         setup_timer(timer, rtl8168_link_timer, (unsigned long)dev);
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-         mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT);
- }
- 
-@@ -24717,12 +24731,19 @@ err_out:
- #define PCI_DEVICE_SERIAL_NUMBER (0x0164)
- 
- static void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-+rtl8168_esd_timer(struct timer_list *timer)
-+{
-+        struct rtl8168_private *tp = from_timer(tp, timer, esd_timer);
-+        struct net_device *dev = tp->dev;
-+#else
- rtl8168_esd_timer(unsigned long __opaque)
- {
-         struct net_device *dev = (struct net_device *)__opaque;
-         struct rtl8168_private *tp = netdev_priv(dev);
--        struct pci_dev *pdev = tp->pci_dev;
-         struct timer_list *timer = &tp->esd_timer;
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-+        struct pci_dev *pdev = tp->pci_dev;
-         unsigned long timeout = RTL8168_ESD_TIMEOUT;
-         unsigned long flags;
-         u8 cmd;
-@@ -24856,11 +24877,18 @@ rtl8168_esd_timer(unsigned long __opaque)
- }
- 
- static void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-+rtl8168_link_timer(struct timer_list *timer)
-+{
-+        struct rtl8168_private *tp = from_timer(tp, timer, link_timer);
-+        struct net_device *dev = tp->dev;
-+#else
- rtl8168_link_timer(unsigned long __opaque)
- {
-         struct net_device *dev = (struct net_device *)__opaque;
-         struct rtl8168_private *tp = netdev_priv(dev);
-         struct timer_list *timer = &tp->link_timer;
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-         unsigned long flags;
- 
-         spin_lock_irqsave(&tp->lock, flags);
\ No newline at end of file
================================================================

---- gitweb:

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