Request 4491 (accepted)

Overview

Request 4491 (accepted)

- Update to new version 8.047.01
- Remove patch r8168-kernel-4.15-2.patch as now upstream
- Modify patch kernel_version.patch

Created by bitstreamout over 5 years ago
In state accepted
Package maintainer: bitstreamout

Submit r8168

Submit package home:bitstreamout:Essentials / r8168 to package Essentials / r8168

r8168.changes Changed

r8168.spec Changed

@@ -15,29 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-#!BuildIgnore: enough-build-resources
 Name:           r8168
-Version:        8.045.08
+Version:        8.047.01
 Release:        0
 License:        GPL-2.0+
 Summary:        Device driver for RealTek Gigabit Ethernet controllers
 # Compare with https://github.com/mtorromeo/r8168 and
-# http://www.realtek.com.tw/Downloads/downloadsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false#2
-Url:            http://www.realtek.com.tw/products/productsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4
+Url:            https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
 Group:          System/Kernel
-Source0:        0010-r8168-8.045.08.tar.bz2
+Source0:        r8168-8.047.01.tar.bz2
 Source1:        preamble
 Source2:        Module.supported
 Patch0:         r8168-kernel_version.patch
 Patch1:         r8168-configuration.patch
-Patch2:         r8168-kernel-4.15-2.patch
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
 BuildRequires:  libelf-devel
 BuildRequires:  module-init-tools
 Requires:       r8168-kmp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  %ix86 x86_64
+ExcludeArch:    s390 s390x
 %kernel_module_package -p preamble
 
 %description
@@ -60,7 +57,6 @@
 %setup -q
 %patch0 -b .p0
 %patch1 -b .p1
-%patch2 -p1 -b .p2
 cp %{S:1} .
 cp %{S:2} .

r8168-kernel-4.15-2.patch Deleted

@@ -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);

r8168-kernel_version.patch Changed

0010-r8168-8.045.08.tar.bz2 Deleted

r8168-8.047.01.tar.bz2 Added

Build Results
RPM Lint

Refresh

Comments for request 4491 0

Request History

bitstreamout created request over 5 years ago

- Update to new version 8.047.01
- Remove patch r8168-kernel-4.15-2.patch as now upstream
- Modify patch kernel_version.patch

bitstreamout accepted request over 5 years ago