]> git.itanic.dy.fi Git - linux-stable/commitdiff
carl9170: remove dead branch in op_conf_tx callback
authorChristian Lamparter <chunkeey@gmail.com>
Sat, 15 Jun 2019 10:00:08 +0000 (12:00 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 27 Jun 2019 17:47:39 +0000 (20:47 +0300)
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>
drivers/net/wireless/ath/carl9170/main.c

index 7f1bdea742b8ae88ab84508f502d2f49295f2187..40a8054f8aa680178997e412ffa772086b791d1b 100644 (file)
@@ -1387,13 +1387,8 @@ static int carl9170_op_conf_tx(struct ieee80211_hw *hw,
        int ret;
 
        mutex_lock(&ar->mutex);
-       if (queue < ar->hw->queues) {
-               memcpy(&ar->edcf[ar9170_qmap[queue]], param, sizeof(*param));
-               ret = carl9170_set_qos(ar);
-       } else {
-               ret = -EINVAL;
-       }
-
+       memcpy(&ar->edcf[ar9170_qmap[queue]], param, sizeof(*param));
+       ret = carl9170_set_qos(ar);
        mutex_unlock(&ar->mutex);
        return ret;
 }