]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop kcfi patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Oct 2022 17:15:40 +0000 (19:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Oct 2022 17:15:40 +0000 (19:15 +0200)
29 files changed:
queue-4.14/net-lantiq_etop-fix-return-type-for-implementation-o.patch [deleted file]
queue-4.14/net-xscale-fix-return-type-for-implementation-of-ndo.patch [deleted file]
queue-4.14/series
queue-4.19/net-lantiq_etop-fix-return-type-for-implementation-o.patch [deleted file]
queue-4.19/net-xscale-fix-return-type-for-implementation-of-ndo.patch [deleted file]
queue-4.19/series
queue-4.9/net-lantiq_etop-fix-return-type-for-implementation-o.patch [deleted file]
queue-4.9/net-xscale-fix-return-type-for-implementation-of-ndo.patch [deleted file]
queue-4.9/series
queue-5.10/net-lantiq_etop-fix-return-type-for-implementation-o.patch [deleted file]
queue-5.10/net-xscale-fix-return-type-for-implementation-of-ndo.patch [deleted file]
queue-5.10/series
queue-5.15/net-broadcom-fix-return-type-for-implementation-of.patch [deleted file]
queue-5.15/net-lantiq_etop-fix-return-type-for-implementation-o.patch [deleted file]
queue-5.15/net-xscale-fix-return-type-for-implementation-of-ndo.patch [deleted file]
queue-5.15/series
queue-5.19/net-broadcom-fix-return-type-for-implementation-of.patch [deleted file]
queue-5.19/net-lantiq_etop-fix-return-type-for-implementation-o.patch [deleted file]
queue-5.19/net-sunplus-fix-return-type-for-implementation-of-nd.patch [deleted file]
queue-5.19/net-xscale-fix-return-type-for-implementation-of-ndo.patch [deleted file]
queue-5.19/series
queue-5.4/net-lantiq_etop-fix-return-type-for-implementation-o.patch [deleted file]
queue-5.4/net-xscale-fix-return-type-for-implementation-of-ndo.patch [deleted file]
queue-5.4/series
queue-6.0/net-broadcom-fix-return-type-for-implementation-of.patch [deleted file]
queue-6.0/net-lantiq_etop-fix-return-type-for-implementation-o.patch [deleted file]
queue-6.0/net-sunplus-fix-return-type-for-implementation-of-nd.patch [deleted file]
queue-6.0/net-xscale-fix-return-type-for-implementation-of-ndo.patch [deleted file]
queue-6.0/series

diff --git a/queue-4.14/net-lantiq_etop-fix-return-type-for-implementation-o.patch b/queue-4.14/net-lantiq_etop-fix-return-type-for-implementation-o.patch
deleted file mode 100644 (file)
index 6c6b6ac..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1b8b0d0f5eff1311aed858f3ab2f1e5ac11438ae Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:21 +0800
-Subject: net: lantiq_etop: Fix return type for implementation of
- ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/lantiq_etop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index afc810069440..c90886d74fde 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -464,7 +464,7 @@ ltq_etop_stop(struct net_device *dev)
-       return 0;
- }
--static int
-+static netdev_tx_t
- ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- {
-       int queue = skb_get_queue_mapping(skb);
--- 
-2.35.1
-
diff --git a/queue-4.14/net-xscale-fix-return-type-for-implementation-of-ndo.patch b/queue-4.14/net-xscale-fix-return-type-for-implementation-of-ndo.patch
deleted file mode 100644 (file)
index c4b988d..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0c1c45442c28da89bd6fb74d2122d6d471fbe501 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:16:12 +0800
-Subject: net: xscale: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-eth_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-index aee55c03def0..d2aed667c0da 100644
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -835,7 +835,7 @@ static void eth_txdone_irq(void *unused)
-       }
- }
--static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
-+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-       unsigned int txreadyq = port->plat->txreadyq;
--- 
-2.35.1
-
index 217aada35ab404e19396f0af0e0eb07ef48834f6..6a3413f1e9515d1068144482567ef12f432d2a17 100644 (file)
@@ -172,8 +172,6 @@ openvswitch-fix-overreporting-of-drops-in-dropwatch.patch
 tcp-annotate-data-race-around-tcp_md5sig_pool_popula.patch
 wifi-ath9k-avoid-uninit-memory-read-in-ath9k_htc_rx_.patch
 xfrm-update-ipcomp_scratches-with-null-when-freed.patch
-net-xscale-fix-return-type-for-implementation-of-ndo.patch
-net-lantiq_etop-fix-return-type-for-implementation-o.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
diff --git a/queue-4.19/net-lantiq_etop-fix-return-type-for-implementation-o.patch b/queue-4.19/net-lantiq_etop-fix-return-type-for-implementation-o.patch
deleted file mode 100644 (file)
index 1e8f615..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From dbdcd21615930991234166d382b17e6f13585f22 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:21 +0800
-Subject: net: lantiq_etop: Fix return type for implementation of
- ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/lantiq_etop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index e08301d833e2..27671163151c 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -465,7 +465,7 @@ ltq_etop_stop(struct net_device *dev)
-       return 0;
- }
--static int
-+static netdev_tx_t
- ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- {
-       int queue = skb_get_queue_mapping(skb);
--- 
-2.35.1
-
diff --git a/queue-4.19/net-xscale-fix-return-type-for-implementation-of-ndo.patch b/queue-4.19/net-xscale-fix-return-type-for-implementation-of-ndo.patch
deleted file mode 100644 (file)
index 2c91012..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From b101b3279930d68f356c5d38822f6e210d01e284 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:16:12 +0800
-Subject: net: xscale: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-eth_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-index aee55c03def0..d2aed667c0da 100644
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -835,7 +835,7 @@ static void eth_txdone_irq(void *unused)
-       }
- }
--static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
-+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-       unsigned int txreadyq = port->plat->txreadyq;
--- 
-2.35.1
-
index 84b4d08c7452dcc7185dddabdea05835712f3599..b86ca8642957031da8d789926e4630bb46c0ff6b 100644 (file)
@@ -185,8 +185,6 @@ openvswitch-fix-overreporting-of-drops-in-dropwatch.patch
 tcp-annotate-data-race-around-tcp_md5sig_pool_popula.patch
 wifi-ath9k-avoid-uninit-memory-read-in-ath9k_htc_rx_.patch
 xfrm-update-ipcomp_scratches-with-null-when-freed.patch
-net-xscale-fix-return-type-for-implementation-of-ndo.patch
-net-lantiq_etop-fix-return-type-for-implementation-o.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
diff --git a/queue-4.9/net-lantiq_etop-fix-return-type-for-implementation-o.patch b/queue-4.9/net-lantiq_etop-fix-return-type-for-implementation-o.patch
deleted file mode 100644 (file)
index 66087c0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 04bfe9580925fdfe2dfa856e4335af65fc788996 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:21 +0800
-Subject: net: lantiq_etop: Fix return type for implementation of
- ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/lantiq_etop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index a167fd7ee13e..f9bff9c5d93e 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -473,7 +473,7 @@ ltq_etop_stop(struct net_device *dev)
-       return 0;
- }
--static int
-+static netdev_tx_t
- ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- {
-       int queue = skb_get_queue_mapping(skb);
--- 
-2.35.1
-
diff --git a/queue-4.9/net-xscale-fix-return-type-for-implementation-of-ndo.patch b/queue-4.9/net-xscale-fix-return-type-for-implementation-of-ndo.patch
deleted file mode 100644 (file)
index 7de00ff..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 25451062268e79de70e91a32dbf49b935c7e07a1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:16:12 +0800
-Subject: net: xscale: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-eth_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-index fa32391720fe..62fcdf75a011 100644
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -835,7 +835,7 @@ static void eth_txdone_irq(void *unused)
-       }
- }
--static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
-+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-       unsigned int txreadyq = port->plat->txreadyq;
--- 
-2.35.1
-
index 58c974ca487899ffbd8509bd8def6563898298d8..71ea0a0bfbb5053aec7a972923f7d75103b70129 100644 (file)
@@ -129,8 +129,6 @@ openvswitch-fix-double-reporting-of-drops-in-dropwat.patch
 openvswitch-fix-overreporting-of-drops-in-dropwatch.patch
 tcp-annotate-data-race-around-tcp_md5sig_pool_popula.patch
 xfrm-update-ipcomp_scratches-with-null-when-freed.patch
-net-xscale-fix-return-type-for-implementation-of-ndo.patch
-net-lantiq_etop-fix-return-type-for-implementation-o.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
 bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch
diff --git a/queue-5.10/net-lantiq_etop-fix-return-type-for-implementation-o.patch b/queue-5.10/net-lantiq_etop-fix-return-type-for-implementation-o.patch
deleted file mode 100644 (file)
index 7a1111a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From a48d3081c2e884f6ccef5a7a1eb58744e006c481 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:21 +0800
-Subject: net: lantiq_etop: Fix return type for implementation of
- ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/lantiq_etop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index 2d0c52f7106b..14c35ca72b75 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -451,7 +451,7 @@ ltq_etop_stop(struct net_device *dev)
-       return 0;
- }
--static int
-+static netdev_tx_t
- ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- {
-       int queue = skb_get_queue_mapping(skb);
--- 
-2.35.1
-
diff --git a/queue-5.10/net-xscale-fix-return-type-for-implementation-of-ndo.patch b/queue-5.10/net-xscale-fix-return-type-for-implementation-of-ndo.patch
deleted file mode 100644 (file)
index 4e9ffde..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6b2e641ecb246b0108a2790a73aa5e031f74d754 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:16:12 +0800
-Subject: net: xscale: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-eth_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-index 403358f2c853..5775e58b0745 100644
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -820,7 +820,7 @@ static void eth_txdone_irq(void *unused)
-       }
- }
--static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
-+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-       unsigned int txreadyq = port->plat->txreadyq;
--- 
-2.35.1
-
index 73fb00fedd70a7e33f11a0d84777259d9838c9c6..257a2bf969b5efe85dc133dc47f990003f5eb6dd 100644 (file)
@@ -359,8 +359,6 @@ tcp-annotate-data-race-around-tcp_md5sig_pool_popula.patch
 micrel-ksz8851-fixes-struct-pointer-issue.patch
 wifi-ath9k-avoid-uninit-memory-read-in-ath9k_htc_rx_.patch
 xfrm-update-ipcomp_scratches-with-null-when-freed.patch
-net-xscale-fix-return-type-for-implementation-of-ndo.patch
-net-lantiq_etop-fix-return-type-for-implementation-o.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
 regulator-core-prevent-integer-underflow.patch
diff --git a/queue-5.15/net-broadcom-fix-return-type-for-implementation-of.patch b/queue-5.15/net-broadcom-fix-return-type-for-implementation-of.patch
deleted file mode 100644 (file)
index 6d4c078..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 41256a0a4ccd2d4af869bcfa02798dc3a0cc85ca Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 15:54:07 +0800
-Subject: net: broadcom: Fix return type for implementation of
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 12f7bd252221d4f9e000e20530e50129241e3a67 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-bcm4908_enet_start_xmit() would return either NETDEV_TX_BUSY or
-NETDEV_TX_OK, so change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Link: https://lore.kernel.org/r/20220902075407.52358-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
-index 376f81796a29..f92ce8f8d751 100644
---- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
-@@ -507,7 +507,7 @@ static int bcm4908_enet_stop(struct net_device *netdev)
-       return 0;
- }
--static int bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)
-+static netdev_tx_t bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)
- {
-       struct bcm4908_enet *enet = netdev_priv(netdev);
-       struct bcm4908_enet_dma_ring *ring = &enet->tx_ring;
--- 
-2.35.1
-
diff --git a/queue-5.15/net-lantiq_etop-fix-return-type-for-implementation-o.patch b/queue-5.15/net-lantiq_etop-fix-return-type-for-implementation-o.patch
deleted file mode 100644 (file)
index 89478bc..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From abcd491a3f636737f779be7a75c0dc3eb4f9e6c3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:21 +0800
-Subject: net: lantiq_etop: Fix return type for implementation of
- ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/lantiq_etop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index 62f8c5212182..7664116b3a62 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -451,7 +451,7 @@ ltq_etop_stop(struct net_device *dev)
-       return 0;
- }
--static int
-+static netdev_tx_t
- ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- {
-       int queue = skb_get_queue_mapping(skb);
--- 
-2.35.1
-
diff --git a/queue-5.15/net-xscale-fix-return-type-for-implementation-of-ndo.patch b/queue-5.15/net-xscale-fix-return-type-for-implementation-of-ndo.patch
deleted file mode 100644 (file)
index 36bd66d..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From f57ac3b5c210de4729a9b501072ba3a30b55696d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:16:12 +0800
-Subject: net: xscale: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-eth_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-index 931494cc1c39..60ac6963529a 100644
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -829,7 +829,7 @@ static void eth_txdone_irq(void *unused)
-       }
- }
--static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
-+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-       unsigned int txreadyq = port->plat->txreadyq;
--- 
-2.35.1
-
index 605d1893ff8b18486cd8353e76bef51da38dadd5..4d81055731d4a2e96ed0317cd3afbaba5009a4ec 100644 (file)
@@ -484,9 +484,6 @@ x86-mce-retrieve-poison-range-from-hardware.patch
 wifi-ath9k-avoid-uninit-memory-read-in-ath9k_htc_rx_.patch
 thunderbolt-add-back-intel-falcon-ridge-end-to-end-f.patch
 xfrm-update-ipcomp_scratches-with-null-when-freed.patch
-net-broadcom-fix-return-type-for-implementation-of.patch
-net-xscale-fix-return-type-for-implementation-of-ndo.patch
-net-lantiq_etop-fix-return-type-for-implementation-o.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
diff --git a/queue-5.19/net-broadcom-fix-return-type-for-implementation-of.patch b/queue-5.19/net-broadcom-fix-return-type-for-implementation-of.patch
deleted file mode 100644 (file)
index 9938d85..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 93afc1e877b88f4630e47edd04b4d2e7978b05e2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 15:54:07 +0800
-Subject: net: broadcom: Fix return type for implementation of
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 12f7bd252221d4f9e000e20530e50129241e3a67 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-bcm4908_enet_start_xmit() would return either NETDEV_TX_BUSY or
-NETDEV_TX_OK, so change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Link: https://lore.kernel.org/r/20220902075407.52358-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
-index c131d8118489..e5e17a182f9d 100644
---- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
-@@ -507,7 +507,7 @@ static int bcm4908_enet_stop(struct net_device *netdev)
-       return 0;
- }
--static int bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)
-+static netdev_tx_t bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)
- {
-       struct bcm4908_enet *enet = netdev_priv(netdev);
-       struct bcm4908_enet_dma_ring *ring = &enet->tx_ring;
--- 
-2.35.1
-
diff --git a/queue-5.19/net-lantiq_etop-fix-return-type-for-implementation-o.patch b/queue-5.19/net-lantiq_etop-fix-return-type-for-implementation-o.patch
deleted file mode 100644 (file)
index b8e1bb7..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 75ba2142b00260e8491750b6738e06570e450ed5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:21 +0800
-Subject: net: lantiq_etop: Fix return type for implementation of
- ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/lantiq_etop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index 7cedbe1fdfd7..59aab4086dcc 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -470,7 +470,7 @@ ltq_etop_stop(struct net_device *dev)
-       return 0;
- }
--static int
-+static netdev_tx_t
- ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- {
-       int queue = skb_get_queue_mapping(skb);
--- 
-2.35.1
-
diff --git a/queue-5.19/net-sunplus-fix-return-type-for-implementation-of-nd.patch b/queue-5.19/net-sunplus-fix-return-type-for-implementation-of-nd.patch
deleted file mode 100644 (file)
index 304c0f8..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From d3ee0e9f09230550b01882b04728b4defa41f9dc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:50 +0800
-Subject: net: sunplus: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 7b620e156097028e4c9b6481a84ec1e1e72877ca ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-spl2sw_ethernet_start_xmit() would return either NETDEV_TX_BUSY or
-NETDEV_TX_OK, so change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081550.60095-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/sunplus/spl2sw_driver.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/sunplus/spl2sw_driver.c b/drivers/net/ethernet/sunplus/spl2sw_driver.c
-index 37711331ba0f..41c2cc9d1f1c 100644
---- a/drivers/net/ethernet/sunplus/spl2sw_driver.c
-+++ b/drivers/net/ethernet/sunplus/spl2sw_driver.c
-@@ -62,7 +62,8 @@ static int spl2sw_ethernet_stop(struct net_device *ndev)
-       return 0;
- }
--static int spl2sw_ethernet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
-+static netdev_tx_t spl2sw_ethernet_start_xmit(struct sk_buff *skb,
-+                                            struct net_device *ndev)
- {
-       struct spl2sw_mac *mac = netdev_priv(ndev);
-       struct spl2sw_common *comm = mac->comm;
--- 
-2.35.1
-
diff --git a/queue-5.19/net-xscale-fix-return-type-for-implementation-of-ndo.patch b/queue-5.19/net-xscale-fix-return-type-for-implementation-of-ndo.patch
deleted file mode 100644 (file)
index 66ade71..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 316cabae6bcfc7b42e23a82e93c379128967d74a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:16:12 +0800
-Subject: net: xscale: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-eth_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-index 89770c2e0ffb..92a59c3e18bf 100644
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -840,7 +840,7 @@ static void eth_txdone_irq(void *unused)
-       }
- }
--static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
-+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-       unsigned int txreadyq = port->plat->txreadyq;
--- 
-2.35.1
-
index 718af8a7ef8351a3729ab2f87d079727bcb50d03..113e4178fc334755b42f0f3ad93f24009684ef34 100644 (file)
@@ -650,10 +650,6 @@ net-next-fix-ip_unicast_if-option-behavior-for-conne.patch
 xfrm-update-ipcomp_scratches-with-null-when-freed.patch
 wifi-ath11k-register-shutdown-handler-for-wcn6750.patch
 rtw89-ser-leave-lps-with-mutex.patch
-net-broadcom-fix-return-type-for-implementation-of.patch
-net-xscale-fix-return-type-for-implementation-of-ndo.patch
-net-sunplus-fix-return-type-for-implementation-of-nd.patch
-net-lantiq_etop-fix-return-type-for-implementation-o.patch
 netlink-bounds-check-struct-nlmsgerr-creation.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 iavf-fix-race-between-iavf_close-and-iavf_reset_task.patch
diff --git a/queue-5.4/net-lantiq_etop-fix-return-type-for-implementation-o.patch b/queue-5.4/net-lantiq_etop-fix-return-type-for-implementation-o.patch
deleted file mode 100644 (file)
index 84d9ea0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From e172ed56763f15546ef23cbe758ce9506aa88657 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:21 +0800
-Subject: net: lantiq_etop: Fix return type for implementation of
- ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/lantiq_etop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index 6e73ffe6f928..46fd128a16a1 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -451,7 +451,7 @@ ltq_etop_stop(struct net_device *dev)
-       return 0;
- }
--static int
-+static netdev_tx_t
- ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- {
-       int queue = skb_get_queue_mapping(skb);
--- 
-2.35.1
-
diff --git a/queue-5.4/net-xscale-fix-return-type-for-implementation-of-ndo.patch b/queue-5.4/net-xscale-fix-return-type-for-implementation-of-ndo.patch
deleted file mode 100644 (file)
index 19a9306..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 25f72124b3f16cd15a43f18b972a8de677458258 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:16:12 +0800
-Subject: net: xscale: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-eth_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-index d4e095d0e8f1..26b5811e7263 100644
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -821,7 +821,7 @@ static void eth_txdone_irq(void *unused)
-       }
- }
--static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
-+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-       unsigned int txreadyq = port->plat->txreadyq;
--- 
-2.35.1
-
index 5c80d2673941129ab998d2e4e70502fa9a40cdf5..fd047f79e06446fed12742cc6b05530d5d8f8ff5 100644 (file)
@@ -201,8 +201,6 @@ openvswitch-fix-overreporting-of-drops-in-dropwatch.patch
 tcp-annotate-data-race-around-tcp_md5sig_pool_popula.patch
 wifi-ath9k-avoid-uninit-memory-read-in-ath9k_htc_rx_.patch
 xfrm-update-ipcomp_scratches-with-null-when-freed.patch
-net-xscale-fix-return-type-for-implementation-of-ndo.patch
-net-lantiq_etop-fix-return-type-for-implementation-o.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch
 bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch
diff --git a/queue-6.0/net-broadcom-fix-return-type-for-implementation-of.patch b/queue-6.0/net-broadcom-fix-return-type-for-implementation-of.patch
deleted file mode 100644 (file)
index cdcedc7..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From e055ac35c332080dacca622cc7c1795cca0077b1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 15:54:07 +0800
-Subject: net: broadcom: Fix return type for implementation of
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 12f7bd252221d4f9e000e20530e50129241e3a67 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-bcm4908_enet_start_xmit() would return either NETDEV_TX_BUSY or
-NETDEV_TX_OK, so change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Link: https://lore.kernel.org/r/20220902075407.52358-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
-index c131d8118489..e5e17a182f9d 100644
---- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
-@@ -507,7 +507,7 @@ static int bcm4908_enet_stop(struct net_device *netdev)
-       return 0;
- }
--static int bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)
-+static netdev_tx_t bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)
- {
-       struct bcm4908_enet *enet = netdev_priv(netdev);
-       struct bcm4908_enet_dma_ring *ring = &enet->tx_ring;
--- 
-2.35.1
-
diff --git a/queue-6.0/net-lantiq_etop-fix-return-type-for-implementation-o.patch b/queue-6.0/net-lantiq_etop-fix-return-type-for-implementation-o.patch
deleted file mode 100644 (file)
index 45f9487..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From b1edf9c6c525200301847cc2db144e155d16efb8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:21 +0800
-Subject: net: lantiq_etop: Fix return type for implementation of
- ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/lantiq_etop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index 7cedbe1fdfd7..59aab4086dcc 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -470,7 +470,7 @@ ltq_etop_stop(struct net_device *dev)
-       return 0;
- }
--static int
-+static netdev_tx_t
- ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- {
-       int queue = skb_get_queue_mapping(skb);
--- 
-2.35.1
-
diff --git a/queue-6.0/net-sunplus-fix-return-type-for-implementation-of-nd.patch b/queue-6.0/net-sunplus-fix-return-type-for-implementation-of-nd.patch
deleted file mode 100644 (file)
index d8e5fa3..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 53b71b192729b471bd8614c887877d8166b4f504 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:15:50 +0800
-Subject: net: sunplus: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 7b620e156097028e4c9b6481a84ec1e1e72877ca ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-spl2sw_ethernet_start_xmit() would return either NETDEV_TX_BUSY or
-NETDEV_TX_OK, so change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081550.60095-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/sunplus/spl2sw_driver.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/sunplus/spl2sw_driver.c b/drivers/net/ethernet/sunplus/spl2sw_driver.c
-index 61d1d07dc070..c9007b7dd832 100644
---- a/drivers/net/ethernet/sunplus/spl2sw_driver.c
-+++ b/drivers/net/ethernet/sunplus/spl2sw_driver.c
-@@ -62,7 +62,8 @@ static int spl2sw_ethernet_stop(struct net_device *ndev)
-       return 0;
- }
--static int spl2sw_ethernet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
-+static netdev_tx_t spl2sw_ethernet_start_xmit(struct sk_buff *skb,
-+                                            struct net_device *ndev)
- {
-       struct spl2sw_mac *mac = netdev_priv(ndev);
-       struct spl2sw_common *comm = mac->comm;
--- 
-2.35.1
-
diff --git a/queue-6.0/net-xscale-fix-return-type-for-implementation-of-ndo.patch b/queue-6.0/net-xscale-fix-return-type-for-implementation-of-ndo.patch
deleted file mode 100644 (file)
index 426c1fd..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7a6ce87e72ba0df668f59ab337670f25ec1ecd90 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 16:16:12 +0800
-Subject: net: xscale: Fix return type for implementation of ndo_start_xmit
-
-From: GUO Zihua <guozihua@huawei.com>
-
-[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
-
-Since Linux now supports CFI, it will be a good idea to fix mismatched
-return type for implementation of hooks. Otherwise this might get
-cought out by CFI and cause a panic.
-
-eth_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so
-change the return type to netdev_tx_t directly.
-
-Signed-off-by: GUO Zihua <guozihua@huawei.com>
-Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-index 3591b9edc9a1..3b05287b6889 100644
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -841,7 +841,7 @@ static void eth_txdone_irq(void *unused)
-       }
- }
--static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
-+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-       unsigned int txreadyq = port->plat->txreadyq;
--- 
-2.35.1
-
index be16ec8a411088367fa0ae23f4c64bb29d23dcc1..861961746866a9d5a77b3e18463145544b05b335 100644 (file)
@@ -724,10 +724,6 @@ net-next-fix-ip_unicast_if-option-behavior-for-conne.patch
 xfrm-update-ipcomp_scratches-with-null-when-freed.patch
 wifi-ath11k-register-shutdown-handler-for-wcn6750.patch
 rtw89-ser-leave-lps-with-mutex.patch
-net-broadcom-fix-return-type-for-implementation-of.patch
-net-xscale-fix-return-type-for-implementation-of-ndo.patch
-net-sunplus-fix-return-type-for-implementation-of-nd.patch
-net-lantiq_etop-fix-return-type-for-implementation-o.patch
 netlink-bounds-check-struct-nlmsgerr-creation.patch
 net-ftmac100-fix-endianness-related-issues-from-spar.patch
 iavf-fix-race-between-iavf_close-and-iavf_reset_task.patch