gentoo auto-resync : 30:06:2024 - 08:00:50

3 files changed, 0 insertions, 91 deletions

diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest
index 78ee99b73a4f..40bfd656b458 100644
--- a/net-misc/r8152/Manifest
+++ b/net-misc/r8152/Manifest
@@ -1,6 +1,4 @@
 AUX r8152-2.16.3-asus-c5000-support.patch 581 BLAKE2B a502be8abc3e714fd6c1d904472e40989d051cef8a1d5fb9a1f4437f47c0cbb0a408fb612f0feb4bdd28fa2bfc9097118746ded59cc05ba9a75eed0e1273647b SHA512 f7055796e243e1783f50677aef850448b85253ed3eb5a4490ae12c245d3f9ebbd6fe3fd9546bce312313537455a1a71076c0d61109d146a42c8a1ba39caa1b75
-AUX r8152-2.16.3-kernel-5.19-fix.patch 1599 BLAKE2B e1300601e2dcd98729481a6d146ffcc0b55e6163c405608ed783bc56acca65654317804c1da780203d96945b49d815b6efd740a752335d4c0aa562f2ba84bbf3 SHA512 6cdb4ee02c6727d87d94fbd4058b7bbd18e3bb4542c2489d4080217ef323faddbf5b998a83dd42b8e1a1e4c1eb6f65762616382fc5fd8519db07d6dd01f83b4a
-AUX r8152-2.16.3-kernel-6.1-fix.patch 1473 BLAKE2B bebafaeaed61bff9ee058ddc64fef6299703bdf9b0c2cd086c86643b362122a8d691577963b9b64f45729bfa4e72f09fe33d6c61fc195d0675bdcd7affd63d7a SHA512 4c5115946a1086d88bc19aa556782aec45fc05f3e38fab8255bb13a863bd2744c08bca0fd6ed72da8c5171fe801436665f4b10bfc22203c500460942a0a6db2d
 AUX r8152-2.16.3-kernel-6.4.10-fix.patch 731 BLAKE2B 2d7820d7dc749bdd4dbbb165116135af2d6831f17b4721afc9c37bbd078f6915cc6c44ce9cb77941ffc52a399a6065269a578128b2c1bb0823658972f8f81dc2 SHA512 a274fc2d5f998ba0c6bfad74c0a56d50c9b146abe012fdd5eebe9719615876e63f55203f3dcf17397e4e28040cd0b253ef861e2cb9636da9c1d050fa844c226c
 AUX r8152-2.17.1-kernel-6.8-strscpy.patch 1298 BLAKE2B 057d7c31115e5903b040f53c964e62d79a3e05308d5b8b072ca6fbf4a3c08e13dc9975e0ca0b6f6342f9e70fc0c957e642ac6d9fdd9f7d915eb7ca7fb24e405a SHA512 4f19815e4f3f9bb3f7934fc13b7c912ab044270512c887b6c89f1409131b73d248d1462c7b1a464eb7e16c590e99bfe46032b36ca5b676896e995964d66d1028
 AUX r8152-2.17.1-kernel-6.9-fix.patch 4008 BLAKE2B 6566782e57e8b69a2cf183a0d63a9e0c17ce9c83974dc23ef1d8588adca14105b4ef8682ca33225be0c4e2ed5121bbc4cd9d5180f44b9c36655d875505c99668 SHA512 4859d41116474e14aec2b03952d155ec07293941181db5cecb27b389c79d4c03ef8ec1abe540ce3b9f04c1ad835f98a11562484dcf168afb100cad91bc96d334
diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch
deleted file mode 100644
index 076d78f46062..000000000000
--- a/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: https://github.com/wget/realtek-r8152-linux/commit/6ffb3760c34a904467d70830ac9c10211e8f5d3a
-From: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
-Date: Wed, 14 Sep 2022 15:13:31 +0200
-Subject: [PATCH] Fix for linux 5.19 without breaking older kernel
- compatibility
-
---- a/r8152.c
-+++ b/r8152.c
-@@ -20458,9 +20458,13 @@ static ssize_t sg_en_store(struct device *dev, struct device_attribute *attr,
- 		return -EINVAL;
- 	}
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-+/* LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) */
-+	netif_set_tso_max_size(netdev, tso_size);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+/* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */
- 	netif_set_gso_max_size(netdev, tso_size);
--#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */
-+#endif
- 
- 	return count;
- }
-@@ -20620,12 +20624,16 @@ static int rtl8152_probe(struct usb_interface *intf,
- 	rtl_get_mapt_ver(tp);
- 
- 	netdev->ethtool_ops = &ops;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-+/* LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) */
-+	netif_set_tso_max_size(netdev, RTL_LIMITED_TSO_SIZE);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+/* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */
- 	if (!tp->sg_use)
- 		netif_set_gso_max_size(netdev, RTL_LIMITED_TSO_SIZE);
- #else
- 	netdev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
--#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */
-+#endif
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
- 	/* MTU range: 68 - 1500 or 9194 */
diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch
deleted file mode 100644
index d20db413a16b..000000000000
--- a/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/ervinpopescu/realtek-r8152-linux/commit/0029747c3cf68dbccbebfcb560277040673dfe36.patch
-From: ervinpopescu <ervin.popescu10@gmail.com>
-Date: Tue, 15 Nov 2022 19:30:16 +0200
-Subject: [PATCH] Fix for linux 6.1 without breaking older kernel compatibility
-
---- a/r8152.c
-+++ b/r8152.c
-@@ -17558,7 +17558,6 @@ static void r8156_init(struct r8152 *tp)
- //		break;
- //	}
- 
--
- 	r8153b_mcu_spdown_en(tp, false);
- 
- 	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS);
-@@ -18339,7 +18338,6 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
- 		cmd->autoneg = AUTONEG_DISABLE;
- 	}
- 
--
- 	if (netif_running(netdev) && netif_carrier_ok(netdev)) {
- 		u16 speed = rtl8152_get_speed(tp);
- 
-@@ -19202,7 +19200,6 @@ static int rtltool_ioctl(struct r8152 *tp, struct ifreq *ifr)
- 		}
- 		break;
- 
--
- 	case RTLTOOL_USB_OCP_WRITE_DWORD:
- 		if (!tp->rtk_enable_diag && net_ratelimit())
- 			netif_warn(tp, drv, netdev,
-@@ -20708,10 +20705,14 @@ static int rtl8152_probe(struct usb_interface *intf,
- 
- 	usb_set_intfdata(intf, tp);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
- 	if (tp->support_2500full)
- 		netif_napi_add(netdev, &tp->napi, r8152_poll, 256);
- 	else
- 		netif_napi_add(netdev, &tp->napi, r8152_poll, 64);
-+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) */
-+  netif_napi_add(netdev, &tp->napi, r8152_poll);
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) */
- 
- 	ret = register_netdev(netdev);
- 	if (ret != 0) {