Commit 856142cd authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: catch queue stop underflow 



If some code stops the queues more times than having started
(for when refcounting is used), warn on and reset the counter
to 0 to avoid blocking forever.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 63b4d8b3

net/mac80211/util.c

+5 −2
Original line number Diff line number Diff line
@@ -288,10 +288,13 @@ static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, 
	if (!test_bit(reason, &local->queue_stop_reasons[queue]))

		return;



	if (!refcounted)

	if (!refcounted) {

		local->q_stop_reasons[queue][reason] = 0;

	else

	} else {

		local->q_stop_reasons[queue][reason]--;

		if (WARN_ON(local->q_stop_reasons[queue][reason] < 0))

			local->q_stop_reasons[queue][reason] = 0;

	}



	if (local->q_stop_reasons[queue][reason] == 0)

		__clear_bit(reason, &local->queue_stop_reasons[queue]);