Update to version 1.033.00

3 files changed, 18 insertions, 113 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f037f7fede47..4253102096ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Sat Feb 10 02:08:58 UTC 2018
+# Mon Jan 21 22:12:04 UTC 2019
 pkgbase = r8101-dkms
-	pkgdesc = r8101 realtek lan drivers (DKMS)
-	pkgver = 1.032.04
+	pkgdesc = RTL810xE Fast Ethernet Driver (DKMS) (MANUAL DOWNLOAD)
+	pkgver = 1.033.00
 	pkgrel = 4
-	url = http://www.realtek.com.tw/
+	url = https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100m-fast-ethernet-pci-express-software
 	arch = i686
 	arch = x86_64
 	license = GPL2
@@ -12,11 +12,9 @@ pkgbase = r8101-dkms
 	optdepends = ethtool: device configuration
 	provides = r8101
 	conflicts = r8101
-	source = http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0008-r8101-1.032.04.tar.bz2
-	source = linux-4.15.patch
+	source = https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100m-fast-ethernet-pci-express-software/0010-r8101-1.033.00.tar.bz2
 	source = dkms.conf
-	sha256sums = cb73c2bae347709009db0de657f7bd0e4a293abf6e8e60a07a97a47867f7b5f7
-	sha256sums = 53f8fcb27ec16a3b29721339184f2f84a4ead26490bf5a9cafedc5edb0524abf
+	sha256sums = 587146b9fd651ec3df5d8b99ee39a6587784627d8d6245185e5d188bc755560c
 	sha256sums = 2846e89fe3fd68c64c71a0f1150873a061571acc63e65cca6d825df7985ad7b5
 
 pkgname = r8101-dkms
diff --git a/PKGBUILD b/PKGBUILD
index e544cdd76a70..68b5b250c675 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,26 +3,27 @@
 
 _pkgbase=r8101
 pkgname=r8101-dkms
-pkgver=1.032.04
+pkgver=1.033.00
 pkgrel=4
-pkgdesc="r8101 realtek lan drivers (DKMS)"
+pkgdesc="RTL810xE Fast Ethernet Driver (DKMS) (MANUAL DOWNLOAD)"
 arch=('i686' 'x86_64')
-url="http://www.realtek.com.tw/"
+url="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100m-fast-ethernet-pci-express-software"
 license=('GPL2')
 depends=('dkms>=2.2.0.3+git151023-5')
 optdepends=('ethtool: device configuration')
 provides=("${_pkgbase}")
 conflicts=("${_pkgbase}")
 
-source=("http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0008-${_pkgbase}-${pkgver}.tar.bz2"
-        'linux-4.15.patch'
+# Modify this array so that it points to the manually downloaded file
+# The current setting is NOT a valid URL
+source=("${url}/0010-${_pkgbase}-${pkgver}.tar.bz2"
         'dkms.conf')
 
-prepare() {
-  cd "r8101-$pkgver"
-  
-  patch -p1 -i "../linux-4.15.patch"
-}
+#prepare() {
+#  cd "r8101-$pkgver"
+#  
+#  patch -p1 -i "../linux-4.15.patch"
+#}
 
 package() {
 
@@ -38,6 +39,5 @@ package() {
   cp -r ${_pkgbase}-${pkgver}/src ${_pkgbase}-${pkgver}/Makefile \
         "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/
 }
-sha256sums=('cb73c2bae347709009db0de657f7bd0e4a293abf6e8e60a07a97a47867f7b5f7'
-            '53f8fcb27ec16a3b29721339184f2f84a4ead26490bf5a9cafedc5edb0524abf'
+sha256sums=('587146b9fd651ec3df5d8b99ee39a6587784627d8d6245185e5d188bc755560c'
             '2846e89fe3fd68c64c71a0f1150873a061571acc63e65cca6d825df7985ad7b5')
diff --git a/linux-4.15.patch b/linux-4.15.patch
deleted file mode 100644
index 6568acfad9c2..000000000000
--- a/linux-4.15.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- r8101-1.032.04/src/r8101_n.c.old
-+++ r8101-1.032.04/src/r8101_n.c
-@@ -211,7 +211,11 @@
- 
- static void rtl8101_dsm(struct net_device *dev, int dev_state);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- static void rtl8101_esd_timer(unsigned long __opaque);
-+#else
-+static void rtl8101_esd_timer(struct timer_list *timer_list);
-+#endif
- 
- static void rtl8101_hw_phy_config(struct net_device *dev);
- 
-@@ -220,7 +224,12 @@
- static void rtl8101_tx_clear(struct rtl8101_private *tp);
- static void rtl8101_rx_clear(struct rtl8101_private *tp);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- static void rtl8101_link_timer(unsigned long __opaque);
-+#else
-+static void rtl8101_link_timer(struct timer_list *timer_list);
-+#endif
-+
- static void rtl8101_aspm_fix1(struct net_device *dev);
- 
- static int rtl8101_open(struct net_device *dev);
-@@ -9132,8 +9141,11 @@
- {
-         struct rtl8101_private *tp = netdev_priv(dev);
-         struct timer_list *timer = &tp->link_timer;
--
--        setup_timer(timer, rtl8101_link_timer, (unsigned long)dev);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
-+        setup_timer(timer, rtl8101_link_timer, (unsigned long)tp);
-+#else
-+        timer_setup(timer, rtl8101_link_timer, 0);
-+#endif
-         mod_timer(timer, jiffies + RTL8101_LINK_TIMEOUT);
- }
- 
-@@ -9147,7 +9159,11 @@
-         struct rtl8101_private *tp = netdev_priv(dev);
-         struct timer_list *timer = &tp->esd_timer;
- 
--        setup_timer(timer, rtl8101_esd_timer, (unsigned long)dev);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
-+        setup_timer(timer, rtl8101_esd_timer, (unsigned long)tp);
-+#else
-+        timer_setup(timer, rtl8101_esd_timer, 0);
-+#endif
-         mod_timer(timer, jiffies + RTL8101_ESD_TIMEOUT);
- }
- 
-@@ -10486,10 +10502,16 @@
- }
- 
- static void
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- rtl8101_esd_timer(unsigned long __opaque)
- {
--        struct net_device *dev = (struct net_device *)__opaque;
--        struct rtl8101_private *tp = netdev_priv(dev);
-+        struct rtl8101_private *tp = (struct rtl8101_private *)__opaque;
-+#else
-+rtl8101_esd_timer(struct timer_list *timer_list)
-+{
-+        struct rtl8101_private *tp = container_of(timer_list, struct rtl8101_private, esd_timer);
-+#endif
-+        struct net_device *dev = tp->dev;
-         struct pci_dev *pdev = tp->pci_dev;
-         struct timer_list *timer = &tp->esd_timer;
-         unsigned long timeout = RTL8101_ESD_TIMEOUT;
-@@ -10597,10 +10619,16 @@
- }
- 
- static void
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- rtl8101_link_timer(unsigned long __opaque)
- {
--        struct net_device *dev = (struct net_device *)__opaque;
--        struct rtl8101_private *tp = netdev_priv(dev);
-+        struct rtl8101_private *tp = (struct rtl8101_private *)__opaque;
-+#else
-+rtl8101_link_timer(struct timer_list *timer_list)
-+{
-+        struct rtl8101_private *tp = container_of(timer_list, struct rtl8101_private, link_timer);
-+#endif
-+        struct net_device *dev = tp->dev;
-         struct timer_list *timer = &tp->link_timer;
-         unsigned long flags;
- 
-