[openwrt/openwrt] generic: 6.6: drop netdev backported patch for netdev_tx_reset_subqueue

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 5 01:42:41 PDT 2025


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/f827d231fb45293f1102405ef8c739e3e4503141

commit f827d231fb45293f1102405ef8c739e3e4503141
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Sat Jul 5 10:39:24 2025 +0200

    generic: 6.6: drop netdev backported patch for netdev_tx_reset_subqueue
    
    Patch backporting netdev_tx_reset_subqueue new OP has been already
    backported in recent minor kernel version for 6.6.
    
    Drop the related patch to fix compilation error on 6.6.
    
    Fixes: 34ba7e8a8ab1 ("generic: backport some flow offload helper patch")
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 ...ce-add-netdev_tx_reset_subqueue-shorthand.patch | 45 ----------------------
 1 file changed, 45 deletions(-)

diff --git a/target/linux/generic/backport-6.6/705-v6.12-netdevice-add-netdev_tx_reset_subqueue-shorthand.patch b/target/linux/generic/backport-6.6/705-v6.12-netdevice-add-netdev_tx_reset_subqueue-shorthand.patch
deleted file mode 100644
index f097ba49d2..0000000000
--- a/target/linux/generic/backport-6.6/705-v6.12-netdevice-add-netdev_tx_reset_subqueue-shorthand.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3dc95a3edd0a86b4a59670b3fafcc64c7d83e2e7 Mon Sep 17 00:00:00 2001
-From: Alexander Lobakin <aleksander.lobakin at intel.com>
-Date: Wed, 4 Sep 2024 17:47:45 +0200
-Subject: [PATCH] netdevice: add netdev_tx_reset_subqueue() shorthand
-
-Add a shorthand similar to other net*_subqueue() helpers for resetting
-the queue by its index w/o obtaining &netdev_tx_queue beforehand
-manually.
-
-Reviewed-by: Przemek Kitszel <przemyslaw.kitszel at intel.com>
-Signed-off-by: Alexander Lobakin <aleksander.lobakin at intel.com>
-Signed-off-by: Tony Nguyen <anthony.l.nguyen at intel.com>
----
- include/linux/netdevice.h | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -3616,6 +3616,17 @@ static inline void netdev_tx_reset_queue
- }
- 
- /**
-+ * netdev_tx_reset_subqueue - reset the BQL stats and state of a netdev queue
-+ * @dev: network device
-+ * @qid: stack index of the queue to reset
-+ */
-+static inline void netdev_tx_reset_subqueue(const struct net_device *dev,
-+					    u32 qid)
-+{
-+	netdev_tx_reset_queue(netdev_get_tx_queue(dev, qid));
-+}
-+
-+/**
-  * 	netdev_reset_queue - reset the packets and bytes count of a network device
-  * 	@dev_queue: network device
-  *
-@@ -3624,7 +3635,7 @@ static inline void netdev_tx_reset_queue
-  */
- static inline void netdev_reset_queue(struct net_device *dev_queue)
- {
--	netdev_tx_reset_queue(netdev_get_tx_queue(dev_queue, 0));
-+	netdev_tx_reset_subqueue(dev_queue, 0);
- }
- 
- /**




More information about the lede-commits mailing list