From: Mohamed Abbas <mabbas@xxxxxxxxxxxxxxx> The driver issues QoS command from post association, some time post_assoc will be called before mac80211 sets QoS data. This patch makes sure the QoS command will be called with new QoS data. Signed-off-by: Mohamed Abbas <mabbas@xxxxxxxxxxxxxxx> Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx> --- drivers/net/wireless/iwl-base.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c index 57b8195..0648bec 100644 --- a/drivers/net/wireless/iwl-base.c +++ b/drivers/net/wireless/iwl-base.c @@ -7811,6 +7811,14 @@ static int iwl_mac_conf_tx(struct ieee80211_hw *hw, int queue, spin_unlock_irqrestore(&priv->lock, flags); + mutex_lock(&priv->mutex); + + /* we wait for the last queue then call qos ucode command */ + if (priv->assoc_id && iwl_is_associated(priv) && (i == (AC_NUM - 1))) + iwl_activate_qos(priv, 0); + + mutex_unlock(&priv->mutex); + #endif /*CONFIG_IWLWIFI_QOS */ IWL_DEBUG_MAC80211("leave\n"); -- 1.5.2 - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html