Update to new version

3 files changed, 14 insertions, 103 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b809277312cc..8b1c64aac442 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Dec 27 15:24:47 UTC 2017
 pkgbase = r8168-dkms
 	pkgdesc = A kernel module for Realtek 8168 network cards
-	pkgver = 8.045.08
-	pkgrel = 3
+	pkgver = 8.046.00
+	pkgrel = 1
 	url = http://www.realtek.com.tw
 	install = r8168-dkms.install
 	arch = i686
@@ -15,12 +13,10 @@ pkgbase = r8168-dkms
 	optdepends = linux-lts-headers: Needed for build the module for LTS Arch kernel
 	optdepends = linux-zen-headers: Needed for build the module for ZEN Arch kernel
 	conflicts = r8168
-	source = http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0010-r8168-8.045.08.tar.bz2
+	source = https://az695102.vo.msecnd.net/rtdrivers/cn/nic/0011-r8168-8.046.00.tar.bz2
 	source = dkms.conf
-	source = linux-4.15-2.patch
-	sha256sums = 29a17aa12b80786cf016799bbe01da8fdd8ee0a4e90b18e740935d81046ec74d
+	sha256sums = 0dfe35904c15ee7578ffa9d77acdf2c4c873a3ef04c261259469e3c081b8dd51
 	sha256sums = 260d8142e944f3144cbc704534e662d427318d8b32dc7a2852a855be72e8d763
-	sha256sums = 483a698f443dae45f2ee56e2f66c4efe26ea678a82ff29fec4258a55325154fd
 
 pkgname = r8168-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index fff92b019329..1b3065a21e9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 _pkgbase=r8168
 pkgname=${_pkgbase}-dkms
-pkgver=8.045.08
-pkgrel=3
+pkgver=8.046.00
+pkgrel=1
 pkgdesc="A kernel module for Realtek 8168 network cards"
 url="http://www.realtek.com.tw"
 license=("GPL")
@@ -12,15 +12,14 @@ optdepends=('linux-headers: Needed for build the module for Arch kernel'
 	'linux-lts-headers: Needed for build the module for LTS Arch kernel'
 	'linux-zen-headers: Needed for build the module for ZEN Arch kernel')
 #source=(https://github.com/mtorromeo/r8168/archive/$pkgver/r8168-$pkgver.tar.gz
-source=(http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0010-r8168-8.045.08.tar.bz2
-        dkms.conf
-        linux-4.15-2.patch)
+source=(https://az695102.vo.msecnd.net/rtdrivers/cn/nic/0011-r8168-8.046.00.tar.bz2
+        dkms.conf)
 install=r8168-dkms.install
 
-prepare() {
-	cd "r8168-$pkgver"
-	patch -p1 -i "$srcdir/linux-4.15-2.patch"
-}
+#prepare() {
+#	cd "r8168-$pkgver"
+#	patch -p1 -i "$srcdir/linux-4.15-2.patch"
+#}
  
 
 package() {
@@ -34,6 +33,5 @@ package() {
 	rm src/Makefile_linux24x
 	cp -dr --no-preserve='ownership' src "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/src"
 }
-sha256sums=('29a17aa12b80786cf016799bbe01da8fdd8ee0a4e90b18e740935d81046ec74d'
-            '260d8142e944f3144cbc704534e662d427318d8b32dc7a2852a855be72e8d763'
-            '483a698f443dae45f2ee56e2f66c4efe26ea678a82ff29fec4258a55325154fd')
+sha256sums=('0dfe35904c15ee7578ffa9d77acdf2c4c873a3ef04c261259469e3c081b8dd51'
+            '260d8142e944f3144cbc704534e662d427318d8b32dc7a2852a855be72e8d763')
diff --git a/linux-4.15-2.patch b/linux-4.15-2.patch
deleted file mode 100644
index f53ab7842280..000000000000
--- a/linux-4.15-2.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