summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2019-06-15 06:00:08 -0400
committerKalle Valo <kvalo@codeaurora.org>2019-06-27 13:47:39 -0400
commit4ba641262b91e4b360564b646ad0ff2166b07ade (patch)
tree32e164118e5026c72b709867c93f0da2d3ea9bfd /drivers/net/wireless
parentfeb09b2933275a70917a869989ea2823e7356be8 (diff)
carl9170: remove dead branch in op_conf_tx callback
This patch removes the error branch for (queue > ar->hw->queues). It is no longer needed anymore as the "queue" value is validated by cfg80211's parse_txq_params() before the driver code gets called. Some background: In the old days (linux 2.6 and early 3.x), the parse_txq_params() function did not verify the "queue" value. That's why these drivers had to do it. Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/carl9170/main.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 7f1bdea742b8..40a8054f8aa6 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1387,13 +1387,8 @@ static int carl9170_op_conf_tx(struct ieee80211_hw *hw,
1387 int ret; 1387 int ret;
1388 1388
1389 mutex_lock(&ar->mutex); 1389 mutex_lock(&ar->mutex);
1390 if (queue < ar->hw->queues) { 1390 memcpy(&ar->edcf[ar9170_qmap[queue]], param, sizeof(*param));
1391 memcpy(&ar->edcf[ar9170_qmap[queue]], param, sizeof(*param)); 1391 ret = carl9170_set_qos(ar);
1392 ret = carl9170_set_qos(ar);
1393 } else {
1394 ret = -EINVAL;
1395 }
1396
1397 mutex_unlock(&ar->mutex); 1392 mutex_unlock(&ar->mutex);
1398 return ret; 1393 return ret;
1399} 1394}