diff options
| author | Toke Høiland-Jørgensen <toke@redhat.com> | 2019-01-22 15:20:16 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-01-25 14:05:27 +0100 |
| commit | 390298e86f8a2e8b428ffb259a323667229ff822 (patch) | |
| tree | fea73410d4be62407f66c461f68121b76e95a7b8 /net/mac80211/driver-ops.h | |
| parent | virt_wifi: remove set but not used variable 'w_priv' (diff) | |
| download | linux-390298e86f8a2e8b428ffb259a323667229ff822.tar.xz linux-390298e86f8a2e8b428ffb259a323667229ff822.zip | |
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: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/driver-ops.h')
| -rw-r--r-- | net/mac80211/driver-ops.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 1aab1734b26f..ba3c07b10cd0 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -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); } |