gentoo auto-resync : 15:04:2023 - 17:48:43

7 files changed, 122 insertions, 6 deletions

diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index f656ed7ee658..e3ee7a7ac06d 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -1,9 +1,13 @@
 AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb6716114bd6cc1b78a5b94f99ea72400f9e9c776eaed60c5dc0593b32857e73aa27883e971b570e7b561cad4b85db1d706194b1 SHA512 a3459c78d55561ae703977e147965b04aa854eff1035c273a703936e6f069d5d501c91cf1db746d0ef93dbfe61c3d28b5d35be34a4982fcbe9f0c42d9204b1bf
 AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df
+AUX r8125-9.009.01-linux-5.19.patch 1423 BLAKE2B 3b587a9261aa695cb9fc5e27032d23b15ff557aa1a467985448ce38b5e259d08d5690406b42d1dc068a82a748de0dff53607bf70ac5515d5c9ced0e7803ef4c0 SHA512 803c1f70d9af86f4ba28e72338c3fff2b2976bc9dac5ca2f733f11382afc0a2a4ac018560e70cbae8ecbd3928ea2a79b010630420f4af66475ce5c9bb3ef73a8
+AUX r8125-9.011.00-linux-6.1.patch 1141 BLAKE2B b018c01a34b1fdf6f3cdaebfeff0a2d3dee4ddc0e47cb4f7a2e1953af9a7d7354e161ab9687e5c927135cf945597a7d276fa5ee3f1a9c9f17ed5e294c7e123ab SHA512 0a23b8477cb6d1de10f6b5fedabc0d8de25963f038b425c3e17851cf5eb4bd7cd76c52625c27be71ff5129fc78cc2325cba6ec26acd5bbc9f0995eeec5970587
 DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
 DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
 DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe
-EBUILD r8125-9.008.00.ebuild 1399 BLAKE2B 59bb8848b09ee1ca476abbfbb156ded1e7cb3961aa287359aff792be2bd0b96b19d74a923ff545c3f6a53427c8536f190ee50d7ba837d5665e1d1e182f677b5c SHA512 45950f83abd6ac72475b58969c3c665eb7aa9fa31e7c6b4ec7aa356e06c58a5c5acc6287c23663a1b24902c8257907c6bb7c333df5370f4fbbc37d36d7a112ac
-EBUILD r8125-9.009.01.ebuild 1185 BLAKE2B b50ff489d98dd5fdf4fa8439c2414a47c71dab9782e3cc0eb052ef833bce84b34ed73dfae16abaaf24fbcaa6b4e9e6e3d4a60653092874c64169e861b80ceae4 SHA512 856ce45440f4e1d47c910588d5f88f85506dcffb01295e868c7033b85289f00fa6d9b2e7727f6c74cf33a7854640da06d4492c8b77cf141c9fb5da4c665b8b9a
-EBUILD r8125-9.009.02.ebuild 1112 BLAKE2B b7c8c255ef0fc6bb698526fcfc029ff46b506062f6d7e335c50c163539c2ef79ef3d40df4228f3f1f19139e339da1ec4ee932ebc446928171a33a5217d313231 SHA512 f50154b223ed5fba7dcb9d91d9302d21e6c3e1bed0710f4969c55432eed14d3c94671f10d343b4261eaabc9f0090d84719769bf04b99536e8a7d9da79a225478
+DIST r8125-9.011.00.tar.bz2 98082 BLAKE2B 306a4fc36149986a24d73cfc3f78e2494a71977640cf7676ae17c2d4f5cff1bf3f5a7ca209fa83bb43a8770acbdc45290b29bbbacc418518271ac316bef9cdd1 SHA512 c2efce2d01025d5dbbd3552390e157b0859ee7ea4e9200d44af61efd7531362bd9f754b5728c89aa2c287915f99492c84c52ee11eec1a4d759bf4228ca75a6c4
+EBUILD r8125-9.008.00.ebuild 1505 BLAKE2B 7eaed2d4118916c7160f66a83d8187261aacbac2bb2d79754474652040afa56ad5c221c00d82e27698f92e7fcbd2e01592b9543a7de85ab25e99b3bc2b777405 SHA512 5d69f6d2614955afc7bc519c45a53f12a26e8545071559a92e83c3b960b3ec598a7f222512eb3b12f0d6473fb8242223b19fd2dfc0c88bc5497b9ac4da22c3f2
+EBUILD r8125-9.009.01.ebuild 1291 BLAKE2B 09509ab84c55c23fd7a17ec3690ce1790df4a4b69ce3fee94d0542b5a379486fa6d4df658a9f02f68f1fb56f7da75c5bc00b494862fb25c54d6fc661cebf7fbb SHA512 28914ec05c9afae5e1936013488dc84161e16c1227b0756909013665e82c9237695390147cf855828af229fbdea3e00617f49c22637a6d8ebac71445a204e200
+EBUILD r8125-9.009.02.ebuild 1184 BLAKE2B 9a503dffad1c25db533f5af0889b1cb9b2978792f162decee7429a2988bed82c3ee408e9234da519ed304eefe8d344577e1c93098db9856d34ee886479967a72 SHA512 04f23d18649ff16c1c693d295f279999a3ad5026540b82385128b98d1fced33fa781a859168e605ec161c3b347b014b26d21130eb0fa31c0648d90e002e1f407
+EBUILD r8125-9.011.00.ebuild 1240 BLAKE2B 3591c2a61306df7016c1a3a8b1c8ca45ae37963640a4aa997e3458782ca2a5dd370e181537b9a7429ffe327eaa97d078a7da770aefe3a93fe05acf719ca3e468 SHA512 e56990fcd91d1d078ecf5e4b458e6c9be3e2fa4a2aa055e4cad0ea22b94d8f4b3929c1eb46db6a6c9e0bf7a8dfcf93d94b8a83432db349469d03cd048772ec3b
 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
diff --git a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch
new file mode 100644
index 000000000000..8dc3f8749a11
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch
@@ -0,0 +1,35 @@
+From c96e5ffc40585d463bea056f2fe02c29d43dcba7 Mon Sep 17 00:00:00 2001
+From: Evgeny Grin <k2k@narod.ru>
+Date: Mon, 3 Apr 2023 18:17:24 +0300
+Subject: [PATCH] Backport kernel 5.19 compatibility
+
+---
+ src/r8125_n.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/r8125_n.c b/src/r8125_n.c
+index 0bc5eec..e35e557 100644
+--- a/src/r8125_n.c
++++ b/src/r8125_n.c
+@@ -12715,6 +12715,10 @@ rtl8125_init_one(struct pci_dev *pdev,
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+                 dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
+                 dev->features |=  NETIF_F_IPV6_CSUM;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
++                netif_set_tso_max_size(dev, LSO_64K);
++                netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO2);
++#else //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
+                 netif_set_gso_max_size(dev, LSO_64K);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+                 dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
+@@ -12722,6 +12726,7 @@ rtl8125_init_one(struct pci_dev *pdev,
+                 dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
+ #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
+ 
+ #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
+-- 
+2.40.0
+
diff --git a/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch b/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch
new file mode 100644
index 000000000000..343ab8ccf125
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch
@@ -0,0 +1,28 @@
+From cc2a99963b0039573464816f0cf86803381d5f11 Mon Sep 17 00:00:00 2001
+From: Evgeny Grin <k2k@narod.ru>
+Date: Mon, 3 Apr 2023 16:46:39 +0300
+Subject: [PATCH] Fixed compatibility with Linux kernel versions >= 6.1
+
+---
+ src/r8125.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/r8125.h b/src/r8125.h
+index 9eac0eb..4a29116 100644
+--- a/src/r8125.h
++++ b/src/r8125.h
+@@ -676,7 +676,11 @@ typedef int *napi_budget;
+ typedef struct napi_struct *napi_ptr;
+ typedef int napi_budget;
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
++#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add_weight(ndev, &priv->napi, function, weight)
++#else  // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+ #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)
++#endif // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+ #define RTL_NAPI_QUOTA(budget, ndev)            min(budget, budget)
+ #define RTL_GET_PRIV(stuct_ptr, priv_struct)        container_of(stuct_ptr, priv_struct, stuct_ptr)
+ #define RTL_GET_NETDEV(priv_ptr)            struct net_device *dev = priv_ptr->dev;
+-- 
+2.40.0
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild
index b848421ede7e..ba9eb264d3da 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,8 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
 PATCHES=(
 	"${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282
 	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
+	"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
+	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
 )
 
 CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01.ebuild
index 2a1b7c235358..a88080038413 100644
--- a/net-misc/r8125/r8125-9.009.01.ebuild
+++ b/net-misc/r8125/r8125-9.009.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,6 +20,8 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
+	"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
+	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
 )
 
 CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02.ebuild
index 9178eeaa64df..bdeb5b0245c5 100644
--- a/net-misc/r8125/r8125-9.009.02.ebuild
+++ b/net-misc/r8125/r8125-9.009.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,6 +18,10 @@ MODULE_NAMES="r8125(net:${S}/src)"
 BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+)
+
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
diff --git a/net-misc/r8125/r8125-9.011.00.ebuild b/net-misc/r8125/r8125-9.011.00.ebuild
new file mode 100644
index 000000000000..40413bb9c984
--- /dev/null
+++ b/net-misc/r8125/r8125-9.011.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8125(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="+multi-tx-q ptp +rss use-firmware"
+
+PATCHES=(
+	"${FILESDIR}/${P}-linux-6.1.patch" # bug 890714
+)
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
+	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
+	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
+	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+	BUILD_PARAMS+=" ENABLE_PAGE_REUSE=y ENABLE_RX_PACKET_FRAGMENT=y"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}