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

Commit a3a0a599 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: dvm: drop VO packets when mac80211 tells us to 



mac80211 now informs the driver when to drop the packets
upon flush(). This will happen before disconnecting, or
before we shut down the interface. We can now rely on this
to drop all the packets including the VO queues.
When mac80211 sets drop to false, wait for all the queues
to be empty.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 4cd4b50c

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+9 −8
Original line number Diff line number Diff line
@@ -1114,16 +1114,17 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	scd_queues &= ~(BIT(IWL_IPAN_CMD_QUEUE_NUM) |

			BIT(IWL_DEFAULT_CMD_QUEUE_NUM));



	if (vif)

		scd_queues &= ~BIT(vif->hw_queue[IEEE80211_AC_VO]);



	IWL_DEBUG_TX_QUEUES(priv, "Flushing SCD queues: 0x%x\n", scd_queues);

	if (drop) {

		IWL_DEBUG_TX_QUEUES(priv, "Flushing SCD queues: 0x%x\n",

				    scd_queues);

		if (iwlagn_txfifo_flush(priv, scd_queues)) {

			IWL_ERR(priv, "flush request fail\n");

			goto done;

		}

	}



	IWL_DEBUG_TX_QUEUES(priv, "wait transmit/flush all frames\n");

	iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);

	iwl_trans_wait_tx_queue_empty(priv->trans, scd_queues);

done:

	mutex_unlock(&priv->mutex);

	IWL_DEBUG_MAC80211(priv, "leave\n");