diff --git a/6.1/target/linux/generic/backport-6.1/103-r8169-use-tp_to_dev-instead-of-open-code.patch b/6.1/target/linux/generic/backport-6.1/103-r8169-use-tp_to_dev-instead-of-open-code.patch deleted file mode 100644 index e151cc6d..00000000 --- a/6.1/target/linux/generic/backport-6.1/103-r8169-use-tp_to_dev-instead-of-open-code.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fd149c4ab09b01136c7e80db020eed59a3385d24 Mon Sep 17 00:00:00 2001 -From: Juhee Kang -Date: Wed, 30 Nov 2022 01:12:44 +0900 -Subject: [PATCH 3/4] r8169: use tp_to_dev instead of open code - -The open code is defined as a helper function(tp_to_dev) on r8169_main.c, -which the open code is &tp->pci_dev->dev. The helper function was added -in commit 1e1205b7d3e9 ("r8169: add helper tp_to_dev"). And then later, -commit f1e911d5d0df ("r8169: add basic phylib support") added -r8169_phylink_handler function but it didn't use the helper function. -Thus, tp_to_dev() replaces the open code. This patch doesn't change logic. - -Signed-off-by: Juhee Kang -Reviewed-by: Heiner Kallweit -Link: https://lore.kernel.org/r/20221129161244.5356-1-claudiajkang@gmail.com -Signed-off-by: Paolo Abeni ---- - drivers/net/ethernet/realtek/r8169_main.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/drivers/net/ethernet/realtek/r8169_main.c -+++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -4559,12 +4559,13 @@ static int rtl8169_poll(struct napi_stru - static void r8169_phylink_handler(struct net_device *ndev) - { - struct rtl8169_private *tp = netdev_priv(ndev); -+ struct device *d = tp_to_dev(tp); - - if (netif_carrier_ok(ndev)) { - rtl_link_chg_patch(tp); -- pm_request_resume(&tp->pci_dev->dev); -+ pm_request_resume(d); - } else { -- pm_runtime_idle(&tp->pci_dev->dev); -+ pm_runtime_idle(d); - } - - phy_print_status(tp->phydev); diff --git a/build.sh b/build.sh index 675e9e80..69ad7dd5 100755 --- a/build.sh +++ b/build.sh @@ -119,9 +119,9 @@ if [ "$OMR_OPENWRT" = "default" ]; then _get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "8939b43659dabe9b737feee02976949ad0355adc" _get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "3e14e055a177dec4bd3a4bd40883b56a6930fd7c" elif [ "$OMR_KERNEL" = "6.1" ]; then - _get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "74e7f8ebbdc19c58ac59c792154041a6b3c124f5" - _get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "b738e42c4de80bcc59559c436618e42845d62fc1" - _get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "957a6313bd6371e5afae20573a43f5440948e66e" + _get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "b196a9f6ce8ef7d6b09d20ef79ffcf464d1a15ab" + _get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "9130a94425c65f05d315beb00020633825e5b446" + _get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "a1f5b6087f04c5e214a31c7201d12c77e65c58e7" elif [ "$OMR_KERNEL" = "6.6" ] || [ "$OMR_KERNEL" = "6.7" ]; then _get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "2872ff7be19cfd20c95c4cbc880c0af38f82ea15" _get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "ee4573cd420888d9ee9d763531865c8c1709728f"