Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 390298e8 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Johannes Berg
Browse files

mac80211: Expose ieee80211_schedule_txq() function 



Since we reworked ieee80211_return_txq() so it assumes that the caller
takes care of logging, we need another function that can be called without
holding any locks. Introduce ieee80211_schedule_txq() which serves this
purpose.

Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e073f7ca

include/net/mac80211.h

+13 −0
Original line number Diff line number Diff line
@@ -6209,6 +6209,19 @@ void ieee80211_txq_schedule_start(struct ieee80211_hw *hw, u8 ac) 
void ieee80211_txq_schedule_end(struct ieee80211_hw *hw, u8 ac)

	__releases(txq_lock);



/**

 * ieee80211_schedule_txq - schedule a TXQ for transmission

 *

 * @hw: pointer as obtained from ieee80211_alloc_hw()

 * @txq: pointer obtained from station or virtual interface

 *

 * Schedules a TXQ for transmission if it is not already scheduled. Takes a

 * lock, which means it must *not* be called between

 * ieee80211_txq_schedule_start() and ieee80211_txq_schedule_end()

 */

void ieee80211_schedule_txq(struct ieee80211_hw *hw, struct ieee80211_txq *txq)

	__acquires(txq_lock) __releases(txq_lock);



/**

 * ieee80211_txq_may_transmit - check whether TXQ is allowed to transmit

 *

net/mac80211/driver-ops.h

+1 −3
Original line number Diff line number Diff line
@@ -1176,9 +1176,7 @@ static inline void drv_wake_tx_queue(struct ieee80211_local *local, 
static inline void schedule_and_wake_txq(struct ieee80211_local *local,

					 struct txq_info *txqi)

{

	spin_lock_bh(&local->active_txq_lock[txqi->txq.ac]);

	ieee80211_return_txq(&local->hw, &txqi->txq);

	spin_unlock_bh(&local->active_txq_lock[txqi->txq.ac]);

	ieee80211_schedule_txq(&local->hw, &txqi->txq);

	drv_wake_tx_queue(local, txqi);

}

net/mac80211/tx.c

+13 −0
Original line number Diff line number Diff line
@@ -3703,6 +3703,19 @@ void ieee80211_return_txq(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL(ieee80211_return_txq);



void ieee80211_schedule_txq(struct ieee80211_hw *hw,

			    struct ieee80211_txq *txq)

	__acquires(txq_lock) __releases(txq_lock)

{

	struct ieee80211_local *local = hw_to_local(hw);

	struct txq_info *txqi = to_txq_info(txq);



	spin_lock_bh(&local->active_txq_lock[txq->ac]);

	ieee80211_return_txq(hw, txq);

	spin_unlock_bh(&local->active_txq_lock[txq->ac]);

}

EXPORT_SYMBOL(ieee80211_schedule_txq);



bool ieee80211_txq_may_transmit(struct ieee80211_hw *hw,

				struct ieee80211_txq *txq)

{