Commit 84b21e61 authored by Gur Stavi's avatar Gur Stavi Committed by Jakub Kicinski
Browse files

queue_api: reduce risk of name collision over txq 



Rename local variable in macros from txq to _txq.
When macro parameter get_desc is expended it is likely to have a txq
token that refers to a different txq variable at the caller's site.

Signed-off-by: default avatarGur Stavi <gur.stavi@huawei.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/95b60d218f004308486d92ed17c8cc6f28bac09d.1747559621.git.gur.stavi@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e41703ac

include/net/netdev_queues.h

+9 −9
Original line number Diff line number Diff line
@@ -288,27 +288,27 @@ netdev_txq_completed_mb(struct netdev_queue *dev_queue, 


#define netif_subqueue_try_stop(dev, idx, get_desc, start_thrs)		\

	({								\

		struct netdev_queue *txq;				\

		struct netdev_queue *_txq;				\

									\

		txq = netdev_get_tx_queue(dev, idx);			\

		netif_txq_try_stop(txq, get_desc, start_thrs);		\

		_txq = netdev_get_tx_queue(dev, idx);			\

		netif_txq_try_stop(_txq, get_desc, start_thrs);		\

	})



#define netif_subqueue_maybe_stop(dev, idx, get_desc, stop_thrs, start_thrs) \

	({								\

		struct netdev_queue *txq;				\

		struct netdev_queue *_txq;				\

									\

		txq = netdev_get_tx_queue(dev, idx);			\

		netif_txq_maybe_stop(txq, get_desc, stop_thrs, start_thrs); \

		_txq = netdev_get_tx_queue(dev, idx);			\

		netif_txq_maybe_stop(_txq, get_desc, stop_thrs, start_thrs); \

	})



#define netif_subqueue_completed_wake(dev, idx, pkts, bytes,		\

				      get_desc, start_thrs)		\

	({								\

		struct netdev_queue *txq;				\

		struct netdev_queue *_txq;				\

									\

		txq = netdev_get_tx_queue(dev, idx);			\

		netif_txq_completed_wake(txq, pkts, bytes,		\

		_txq = netdev_get_tx_queue(dev, idx);			\

		netif_txq_completed_wake(_txq, pkts, bytes,		\

					 get_desc, start_thrs);		\

	})