iwlwifi: mvm: update txq metadata to current owner
authorLiad Kaufman <liad.kaufman@intel.com>
Sun, 18 Sep 2016 11:51:59 +0000 (14:51 +0300)
committerLuca Coelho <luciano.coelho@intel.com>
Wed, 19 Oct 2016 08:30:29 +0000 (11:30 +0300)
When a TXQ's owner is changed, the FW is indeed notified, but
the driver doesn't update the current metadata to reflect the
owner change. Fix that.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/sta.c

index fc77188..a65030f 100644 (file)
@@ -875,12 +875,17 @@ static void iwl_mvm_change_queue_owner(struct iwl_mvm *mvm, int queue)
        cmd.tx_fifo = iwl_mvm_ac_to_tx_fifo[tid_to_mac80211_ac[tid]];
 
        ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0, sizeof(cmd), &cmd);
-       if (ret)
+       if (ret) {
                IWL_ERR(mvm, "Failed to update owner of TXQ %d (ret=%d)\n",
                        queue, ret);
-       else
-               IWL_DEBUG_TX_QUEUES(mvm, "Changed TXQ %d ownership to tid %d\n",
-                                   queue, tid);
+               return;
+       }
+
+       spin_lock_bh(&mvm->queue_info_lock);
+       mvm->queue_info[queue].txq_tid = tid;
+       spin_unlock_bh(&mvm->queue_info_lock);
+       IWL_DEBUG_TX_QUEUES(mvm, "Changed TXQ %d ownership to tid %d\n",
+                           queue, tid);
 }
 
 static void iwl_mvm_unshare_queue(struct iwl_mvm *mvm, int queue)