From ed2a776c5585e5634ed41f44183243f067c86efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Tue, 4 Mar 2025 10:02:09 +0100 Subject: [PATCH] Remove obsolete patches --- .../6.11/fix-wrong-autoneg-state.patch | 29 ------------------- patches/frr/8.5.4/0001-libyang-compat.patch | 22 -------------- 2 files changed, 51 deletions(-) delete mode 100644 patches/ethtool/6.11/fix-wrong-autoneg-state.patch delete mode 100644 patches/frr/8.5.4/0001-libyang-compat.patch diff --git a/patches/ethtool/6.11/fix-wrong-autoneg-state.patch b/patches/ethtool/6.11/fix-wrong-autoneg-state.patch deleted file mode 100644 index c44176cc..00000000 --- a/patches/ethtool/6.11/fix-wrong-autoneg-state.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9b2f6b94132d14b1d2d2a7d3b65bac4f3a056aac Mon Sep 17 00:00:00 2001 -From: Mohan Prasad J -Date: Mon, 4 Nov 2024 04:04:07 +0530 -Subject: netlink: settings: Fix for wrong auto-negotiation state - -Auto-negotiation state in json format showed the -opposite state due to wrong comparison. -Fix for returning the correct auto-neg state implemented. - -Signed-off-by: Mohan Prasad J ---- - netlink/settings.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/netlink/settings.c b/netlink/settings.c -index dbfb520..b9b3ba9 100644 ---- a/netlink/settings.c -+++ b/netlink/settings.c -@@ -546,7 +546,7 @@ int linkmodes_reply_cb(const struct nlmsghdr *nlhdr, void *data) - (autoneg == AUTONEG_DISABLE) ? "off" : "on"); - else - print_bool(PRINT_JSON, "auto-negotiation", NULL, -- autoneg == AUTONEG_DISABLE); -+ autoneg != AUTONEG_DISABLE); - } - if (tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG]) { - uint8_t val; --- -cgit 1.2.3-korg diff --git a/patches/frr/8.5.4/0001-libyang-compat.patch b/patches/frr/8.5.4/0001-libyang-compat.patch deleted file mode 100644 index 7b6093e4..00000000 --- a/patches/frr/8.5.4/0001-libyang-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/yang.c b/lib/yang.c -index ef1cf898a..c780b8e8c 100644 ---- a/lib/yang.c -+++ b/lib/yang.c -@@ -647,7 +647,7 @@ struct yang_data *yang_data_list_find(const struct list *list, - } - - /* Make libyang log its errors using FRR logging infrastructure. */ --static void ly_log_cb(LY_LOG_LEVEL level, const char *msg, const char *path) -+static void ly_log_cb(LY_LOG_LEVEL level, const char *msg, const char *path, uint64_t line) - { - int priority = LOG_ERR; - -@@ -742,7 +742,7 @@ struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile) - void yang_init(bool embedded_modules, bool defer_compile) - { - /* Initialize libyang global parameters that affect all containers. */ -- ly_set_log_clb(ly_log_cb, 1); -+ ly_set_log_clb(ly_log_cb); - ly_log_options(LY_LOLOG | LY_LOSTORE); - - /* Initialize libyang container for native models. */