From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 6 Dec 2018 11:04:31 +0000 (+0100)
Subject: iwlwifi: mvm: remove redundant condition
X-Git-Tag: v5.1-rc1~178^2~131^2~77^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f992c61d59fb2eb1a234890ef92f378a47ebe20b;p=thirdparty%2Fkernel%2Flinux.git

iwlwifi: mvm: remove redundant condition

In iwl_mvm_sta_alloc_queue_tvqm(), we know that we have a
station, so no need to check it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 3ea39bb533e82..27839c10d5e37 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -791,11 +791,9 @@ static int iwl_mvm_sta_alloc_queue_tvqm(struct iwl_mvm *mvm,
 	if (queue < 0)
 		return queue;
 
-	if (sta) {
-		mvmtxq->txq_id = queue;
-		mvm->tvqm_info[queue].txq_tid = tid;
-		mvm->tvqm_info[queue].sta_id = mvmsta->sta_id;
-	}
+	mvmtxq->txq_id = queue;
+	mvm->tvqm_info[queue].txq_tid = tid;
+	mvm->tvqm_info[queue].sta_id = mvmsta->sta_id;
 
 	IWL_DEBUG_TX_QUEUES(mvm, "Allocated queue is %d\n", queue);