drop net-sparx5-fix-function-return-type-to-match-actual-.patch

diff --git a/queue-5.19/net-sparx5-fix-function-return-type-to-match-actual-.patch b/queue-5.19/net-sparx5-fix-function-return-type-to-match-actual-.patch
deleted file mode 100644 (file)
index 2417ad8..0000000
--- a/queue-5.19/net-sparx5-fix-function-return-type-to-match-actual-.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 91ef38e3e1813ce32dd40e8cc6af2bcadea20504 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Sep 2022 08:58:15 +0200
-Subject: net: sparx5: fix function return type to match actual type
-
-From: Casper Andersson <casper.casan@gmail.com>
-
-[ Upstream commit 75554fe00f941c3c3d9344e88708093a14d2b4b8 ]
-
-Function returns error integer, not bool.
-
-Does not have any impact on functionality.
-
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Casper Andersson <casper.casan@gmail.com>
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Link: https://lore.kernel.org/r/20220906065815.3856323-1-casper.casan@gmail.com
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c | 4 ++--
- drivers/net/ethernet/microchip/sparx5/sparx5_main.h     | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c b/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
-index a5837dbe0c7e..4af285918ea2 100644
---- a/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
-+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
-@@ -186,8 +186,8 @@ bool sparx5_mact_getnext(struct sparx5 *sparx5,
-       return ret == 0;
- }
- 
--bool sparx5_mact_find(struct sparx5 *sparx5,
--                    const unsigned char mac[ETH_ALEN], u16 vid, u32 *pcfg2)
-+int sparx5_mact_find(struct sparx5 *sparx5,
-+                   const unsigned char mac[ETH_ALEN], u16 vid, u32 *pcfg2)
- {
-       int ret;
-       u32 cfg2;
-diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
-index b197129044b5..d071ac3b7106 100644
---- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
-+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
-@@ -307,8 +307,8 @@ int sparx5_mact_learn(struct sparx5 *sparx5, int port,
-                     const unsigned char mac[ETH_ALEN], u16 vid);
- bool sparx5_mact_getnext(struct sparx5 *sparx5,
-                        unsigned char mac[ETH_ALEN], u16 *vid, u32 *pcfg2);
--bool sparx5_mact_find(struct sparx5 *sparx5,
--                    const unsigned char mac[ETH_ALEN], u16 vid, u32 *pcfg2);
-+int sparx5_mact_find(struct sparx5 *sparx5,
-+                   const unsigned char mac[ETH_ALEN], u16 vid, u32 *pcfg2);
- int sparx5_mact_forget(struct sparx5 *sparx5,
-                      const unsigned char mac[ETH_ALEN], u16 vid);
- int sparx5_add_mact_entry(struct sparx5 *sparx5,
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index 1f7e58da8b8182b2bf7bde315dacf8fd0e8759bb..a3daa8590b33822bef67d172ac82264d45a12a25 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -653,7 +653,6 @@ rtw89-ser-leave-lps-with-mutex.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 iavf-fix-race-between-iavf_close-and-iavf_reset_task.patch
 wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
-net-sparx5-fix-function-return-type-to-match-actual-.patch
 bluetooth-btintel-mark-intel-controller-to-support-l.patch
 regulator-core-prevent-integer-underflow.patch
 wifi-ath11k-mhi-fix-potential-memory-leak-in-ath11k_.patch

diff --git a/queue-6.0/net-sparx5-fix-function-return-type-to-match-actual-.patch b/queue-6.0/net-sparx5-fix-function-return-type-to-match-actual-.patch
deleted file mode 100644 (file)
index 7f21d1f..0000000
--- a/queue-6.0/net-sparx5-fix-function-return-type-to-match-actual-.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 7f6115df332c9df1dcdef01c14f18cb24d90cfa8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Sep 2022 08:58:15 +0200
-Subject: net: sparx5: fix function return type to match actual type
-
-From: Casper Andersson <casper.casan@gmail.com>
-
-[ Upstream commit 75554fe00f941c3c3d9344e88708093a14d2b4b8 ]
-
-Function returns error integer, not bool.
-
-Does not have any impact on functionality.
-
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Casper Andersson <casper.casan@gmail.com>
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Link: https://lore.kernel.org/r/20220906065815.3856323-1-casper.casan@gmail.com
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c | 4 ++--
- drivers/net/ethernet/microchip/sparx5/sparx5_main.h     | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c b/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
-index a5837dbe0c7e..4af285918ea2 100644
---- a/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
-+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
-@@ -186,8 +186,8 @@ bool sparx5_mact_getnext(struct sparx5 *sparx5,
-       return ret == 0;
- }
- 
--bool sparx5_mact_find(struct sparx5 *sparx5,
--                    const unsigned char mac[ETH_ALEN], u16 vid, u32 *pcfg2)
-+int sparx5_mact_find(struct sparx5 *sparx5,
-+                   const unsigned char mac[ETH_ALEN], u16 vid, u32 *pcfg2)
- {
-       int ret;
-       u32 cfg2;
-diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
-index b197129044b5..d071ac3b7106 100644
---- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
-+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
-@@ -307,8 +307,8 @@ int sparx5_mact_learn(struct sparx5 *sparx5, int port,
-                     const unsigned char mac[ETH_ALEN], u16 vid);
- bool sparx5_mact_getnext(struct sparx5 *sparx5,
-                        unsigned char mac[ETH_ALEN], u16 *vid, u32 *pcfg2);
--bool sparx5_mact_find(struct sparx5 *sparx5,
--                    const unsigned char mac[ETH_ALEN], u16 vid, u32 *pcfg2);
-+int sparx5_mact_find(struct sparx5 *sparx5,
-+                   const unsigned char mac[ETH_ALEN], u16 vid, u32 *pcfg2);
- int sparx5_mact_forget(struct sparx5 *sparx5,
-                      const unsigned char mac[ETH_ALEN], u16 vid);
- int sparx5_add_mact_entry(struct sparx5 *sparx5,
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index e4cdd57f6139d2492d3227618a0ee5fd203fd040..ed2542304bfbea87211d54d14bea1d2037a79964 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -727,7 +727,6 @@ rtw89-ser-leave-lps-with-mutex.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 iavf-fix-race-between-iavf_close-and-iavf_reset_task.patch
 wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
-net-sparx5-fix-function-return-type-to-match-actual-.patch
 bluetooth-btintel-mark-intel-controller-to-support-l.patch
 regulator-core-prevent-integer-underflow.patch
 wifi-ath11k-mhi-fix-potential-memory-leak-in-ath11k_.patch