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

Commit 811a3991 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

rt2x00: check against flushing empty queue 



We have check if queue is not empty when start flushing queues on
by mac80211 callback, but we also can start flushing queues by internal
driver calls. So move check into rt2x00queue_flush_queue() to assure
we do not flush empty queue anytime.

Additionally add warning if we start to kick empty queue as in such
situation we set wrong index in the HW queue, what can confuse the HW
and have various negative consequences.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 9c87758c

drivers/net/wireless/ralink/rt2x00/rt2800mmio.c

+1 −0
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ void rt2800mmio_kick_queue(struct data_queue *queue) 
	case QID_AC_VI:

	case QID_AC_BE:

	case QID_AC_BK:

		WARN_ON_ONCE(rt2x00queue_empty(queue));

		entry = rt2x00queue_get_entry(queue, Q_INDEX);

		rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX(queue->qid),

					  entry->entry_idx);

drivers/net/wireless/ralink/rt2x00/rt2x00mac.c

+1 −2
Original line number Diff line number Diff line
@@ -739,7 +739,6 @@ void rt2x00mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		return;



	tx_queue_for_each(rt2x00dev, queue)

		if (!rt2x00queue_empty(queue))

		rt2x00queue_flush_queue(queue, drop);

}

EXPORT_SYMBOL_GPL(rt2x00mac_flush);

drivers/net/wireless/ralink/rt2x00/rt2x00queue.c

+2 −0
Original line number Diff line number Diff line
@@ -1000,6 +1000,8 @@ void rt2x00queue_flush_queue(struct data_queue *queue, bool drop) 
		(queue->qid == QID_AC_BE) ||

		(queue->qid == QID_AC_BK);



	if (rt2x00queue_empty(queue))

		return;



	/*

	 * If we are not supposed to drop any pending