On Sun, Aug 09, 2009 at 02:24:09PM +0200, Christian Lamparter wrote: > From: Dan Carpenter <error27@xxxxxxxxx> > > queue == __AR9170_NUM_TXQ would cause a bug on the next line. > > found by Smatch ( http://repo.or.cz/w/smatch.git ). > > Cc: stable@xxxxxxxxxx > Reported-by: Dan Carpenter <error27@xxxxxxxxx> > Signed-off-by: Dan Carpenter <error27@xxxxxxxxx> > Signed-off-by: Christian Lamparter <chunkeey@xxxxxx> > --- > diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c > index 4fc389a..ea8c941 100644 > --- a/drivers/net/wireless/ath/ar9170/main.c > +++ b/drivers/net/wireless/ath/ar9170/main.c > @@ -2458,13 +2458,14 @@ static int ar9170_conf_tx(struct ieee80211_hw *hw, u16 queue, > int ret; > > mutex_lock(&ar->mutex); > - if ((param) && !(queue > __AR9170_NUM_TXQ)) { > + if (queue < __AR9170_NUM_TXQ) { > memcpy(&ar->edcf[ar9170_qos_hwmap[queue]], > param, sizeof(*param)); > > ret = ar9170_set_qos(ar); > - } else > + } else { > ret = -EINVAL; > + } > > mutex_unlock(&ar->mutex); > return ret; The p54 version of this patch used hw->queues instead of a constant. Wouldn't that be better here? John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
