Have ieee80211_queue_stopped() return a bitmap of enum queue_stop_reasons while checking queue status. This is handy when we care about the queue stop reason codes.
Signed-off-by: Thomas Pedersen <[email protected]> --- include/net/mac80211.h | 10 +++++++--- net/mac80211/util.c | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 64faf01..8bbe799 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -3589,15 +3589,19 @@ void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue); /** * ieee80211_queue_stopped - test status of the queue + * * @hw: pointer as obtained from ieee80211_alloc_hw(). * @queue: queue number (counted from zero). * * Drivers should use this function instead of netif_stop_queue. * - * Return: %true if the queue is stopped. %false otherwise. + * Return 0 if queue not stopped, or else a bitmap of + * queue_stop_reasons. + * + * If @queue doesn't exist, return -1UL. + * */ - -int ieee80211_queue_stopped(struct ieee80211_hw *hw, int queue); +unsigned long ieee80211_queue_stopped(struct ieee80211_hw *hw, int queue); /** * ieee80211_stop_queues - stop all queues diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 447e665..739cddb 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -475,17 +475,17 @@ void ieee80211_stop_queues(struct ieee80211_hw *hw) } EXPORT_SYMBOL(ieee80211_stop_queues); -int ieee80211_queue_stopped(struct ieee80211_hw *hw, int queue) +unsigned long ieee80211_queue_stopped(struct ieee80211_hw *hw, int queue) { struct ieee80211_local *local = hw_to_local(hw); unsigned long flags; - int ret; + unsigned long ret; if (WARN_ON(queue >= hw->queues)) - return true; + return -1UL; spin_lock_irqsave(&local->queue_stop_reason_lock, flags); - ret = !!local->queue_stop_reasons[queue]; + ret = local->queue_stop_reasons[queue]; spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); return ret; } -- 1.7.10.4 _______________________________________________ Devel mailing list [email protected] http://lists.open80211s.org/cgi-bin/mailman/listinfo/devel
