Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/files/
Date: Tue, 02 Feb 2021 21:38:47
Message-Id: 1612301598.82165dfda1c22c0b331157ec2d328cde4a1bcb3f.conikost@gentoo
1 commit: 82165dfda1c22c0b331157ec2d328cde4a1bcb3f
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 2 21:33:18 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 21:33:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82165dfd
7
8 net-misc/r8168: drop unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/19292
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 net-misc/r8168/files/kernel56.patch | 50 -------------------------------------
15 1 file changed, 50 deletions(-)
16
17 diff --git a/net-misc/r8168/files/kernel56.patch b/net-misc/r8168/files/kernel56.patch
18 deleted file mode 100644
19 index 23bb3a1856a..00000000000
20 --- a/net-misc/r8168/files/kernel56.patch
21 +++ /dev/null
22 @@ -1,50 +0,0 @@
23 ---- r8168-8.048.00/src/r8168_n.c 2019-11-26 08:32:35.000000000 +0000
24 -+++ r8168-8.048.00/src/r8168_n.c 2020-03-16 12:34:04.893511463 +0000
25 -@@ -456,7 +456,13 @@ static void rtl8168_hw_config(struct net
26 - static void rtl8168_hw_start(struct net_device *dev);
27 - static int rtl8168_close(struct net_device *dev);
28 - static void rtl8168_set_rx_mode(struct net_device *dev);
29 -+
30 -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
31 - static void rtl8168_tx_timeout(struct net_device *dev);
32 -+#else
33 -+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
34 -+#endif
35 -+
36 - static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);
37 - static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget);
38 - static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);
39 -@@ -1616,12 +1622,21 @@ static int rtl8168_proc_open(struct inod
40 - return single_open(file, show, dev);
41 - }
42 -
43 -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
44 - static const struct file_operations rtl8168_proc_fops = {
45 - .open = rtl8168_proc_open,
46 - .read = seq_read,
47 - .llseek = seq_lseek,
48 - .release = single_release,
49 - };
50 -+#else
51 -+static const struct proc_ops rtl8168_proc_fops = {
52 -+ .proc_open = rtl8168_proc_open,
53 -+ .proc_read = seq_read,
54 -+ .proc_lseek = seq_lseek,
55 -+ .proc_release = single_release,
56 -+};
57 -+#endif
58 - #endif
59 -
60 - /*
61 -@@ -27844,7 +27859,11 @@ static void rtl8168_reset_task(struct wo
62 - }
63 -
64 - static void
65 -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
66 - rtl8168_tx_timeout(struct net_device *dev)
67 -+#else
68 -+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
69 -+#endif
70 - {
71 - struct rtl8168_private *tp = netdev_priv(dev);
72 - unsigned long flags;
73 \ No newline at end of file