From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- net-misc/r8168/Manifest | 1 - net-misc/r8168/files/kernel56.patch | 50 ------------------------------------- 2 files changed, 51 deletions(-) delete mode 100644 net-misc/r8168/files/kernel56.patch (limited to 'net-misc/r8168') diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index b8d89bfecd6f..d68493b1cc9b 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,4 +1,3 @@ -AUX kernel56.patch 1863 BLAKE2B 8525effb79f50ca818797cb48f3eb225f5e50f7fe156186643c9639c7e30a5f03716b257c357e1f7b090792594025ba0525763a93b481a992822a8cc251c4332 SHA512 e50734adbd76627bccb4f0f08d6d1a3042a72fc7a836aac049c897ce9d7f37c41a0d0f7da1fc158d1ae8c14329ff2967687420bae0c72f7ebf9845f795d24aba DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f diff --git a/net-misc/r8168/files/kernel56.patch b/net-misc/r8168/files/kernel56.patch deleted file mode 100644 index 23bb3a1856aa..000000000000 --- a/net-misc/r8168/files/kernel56.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- r8168-8.048.00/src/r8168_n.c 2019-11-26 08:32:35.000000000 +0000 -+++ r8168-8.048.00/src/r8168_n.c 2020-03-16 12:34:04.893511463 +0000 -@@ -456,7 +456,13 @@ static void rtl8168_hw_config(struct net - static void rtl8168_hw_start(struct net_device *dev); - static int rtl8168_close(struct net_device *dev); - static void rtl8168_set_rx_mode(struct net_device *dev); -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) - static void rtl8168_tx_timeout(struct net_device *dev); -+#else -+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue); -+#endif -+ - static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); - static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget); - static int rtl8168_change_mtu(struct net_device *dev, int new_mtu); -@@ -1616,12 +1622,21 @@ static int rtl8168_proc_open(struct inod - return single_open(file, show, dev); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) - static const struct file_operations rtl8168_proc_fops = { - .open = rtl8168_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - }; -+#else -+static const struct proc_ops rtl8168_proc_fops = { -+ .proc_open = rtl8168_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+}; -+#endif - #endif - - /* -@@ -27844,7 +27859,11 @@ static void rtl8168_reset_task(struct wo - } - - static void -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) - rtl8168_tx_timeout(struct net_device *dev) -+#else -+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue) -+#endif - { - struct rtl8168_private *tp = netdev_priv(dev); - unsigned long flags; \ No newline at end of file -- cgit v1.2.3