Commit 4ba64126 authored Jun 15, 2019 by Christian Lamparter Committed by Kalle Valo Jun 27, 2019

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>

parent feb09b29

drivers/net/wireless/ath/carl9170/main.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}

		mutex_unlock(&ar->mutex);
		return ret;
		}

Admin message