carl9170: remove dead branch in op_conf_tx callback
Subsystems (2)
PATCH 1/1 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.
--- drivers/net/wireless/ath/carl9170/main.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/carl9170/main.c +2 -7
@@ -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; }
Signature · 1 line
2.20.1
PATCH 1/1 p54: remove dead branch in op_conf_tx callback
This patch removes the error branch for (queue > dev->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.
--- drivers/net/wireless/intersil/p54/main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wireless/intersil/p54/main.c +3 -6
@@ -414,12 +414,9 @@ static int p54_conf_tx(struct ieee80211_hw *dev,int ret;mutex_lock (&priv->conf_mutex); -if (queue < dev->queues) { -P54_SET_QUEUE (priv->qos_params[queue], params->aifs, - params->cw_min, params->cw_max, params->txop); - ret =p54_set_edcf (priv); - }else - ret = -EINVAL ; +P54_SET_QUEUE (priv->qos_params[queue], params->aifs, + params->cw_min, params->cw_max, params->txop); + ret =p54_set_edcf (priv);mutex_unlock (&priv->conf_mutex);return ret; }
Signature · 1 line
2.20.1
Re: [PATCH] p54: remove dead branch in op_conf_tx callback
Quoted 5 lines · Christian Lamparter
This patch removes the error branch for (queue >
dev->queues). It is no longer needed anymore as the "queue" value is validated by cfg80211'sparse_txq_params()before the driver code gets called.Signed-off-by Christian Lamparter <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
12e66ffbd534 p54: remove dead branch in op_conf_tx callback
Signature · 3 lines
https://patchwork.kernel.org/patch/10997025/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 11 lines · Christian Lamparter
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'sparse_txq_params()before the driver code gets called.Some background:
In the old days (linux 2.6 and early 3.x), theparse_txq_params()function did not verify the "queue" value. That's why these drivers had to do it.Signed-off-by Christian Lamparter <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
4ba641262b91 carl9170: remove dead branch in op_conf_tx callback
Signature · 3 lines
https://patchwork.kernel.org/patch/10997023/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches