| Message ID | 703d549e3088367651d92a059743f1be848d74b7.1658133689.git.dcaratti@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ca0cab11928870701535fbc3e49a4b196f722743 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net/sched: remove qdisc_root_lock() helper | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 18 Jul 2022 10:55:12 +0200 you wrote: > the last caller has been removed with commit 96f5e66e8a79 ("mac80211: fix > aggregation for hardware with ampdu queues"), so it's safe to remove this > function. > > Signed-off-by: Davide Caratti <dcaratti@redhat.com> > --- > include/net/sch_generic.h | 19 ------------------- > 1 file changed, 19 deletions(-) Here is the summary with links: - [net-next] net/sched: remove qdisc_root_lock() helper https://git.kernel.org/netdev/net-next/c/ca0cab119288 You are awesome, thank you!
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index d6cf5116b5f9..ec693fe7c553 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -551,25 +551,6 @@ static inline struct Qdisc *qdisc_root_sleeping(const struct Qdisc *qdisc) return qdisc->dev_queue->qdisc_sleeping; } -/* The qdisc root lock is a mechanism by which to top level - * of a qdisc tree can be locked from any qdisc node in the - * forest. This allows changing the configuration of some - * aspect of the qdisc tree while blocking out asynchronous - * qdisc access in the packet processing paths. - * - * It is only legal to do this when the root will not change - * on us. Otherwise we'll potentially lock the wrong qdisc - * root. This is enforced by holding the RTNL semaphore, which - * all users of this lock accessor must do. - */ -static inline spinlock_t *qdisc_root_lock(const struct Qdisc *qdisc) -{ - struct Qdisc *root = qdisc_root(qdisc); - - ASSERT_RTNL(); - return qdisc_lock(root); -} - static inline spinlock_t *qdisc_root_sleeping_lock(const struct Qdisc *qdisc) { struct Qdisc *root = qdisc_root_sleeping(qdisc);
the last caller has been removed with commit 96f5e66e8a79 ("mac80211: fix aggregation for hardware with ampdu queues"), so it's safe to remove this function. Signed-off-by: Davide Caratti <dcaratti@redhat.com> --- include/net/sch_generic.h | 19 ------------------- 1 file changed, 19 deletions(-)