diff options
| author | Christian Lamparter <chunkeey@web.de> | 2008-11-24 14:52:51 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-11-26 09:47:50 -0500 |
| commit | b50563a68520dea3a19b5a8013c4ae0f8e3b49dd (patch) | |
| tree | 81f8758265cf29f050b922fe167fea2367f6e17b /drivers/net/wireless | |
| parent | 99405f930fda280c9114b15e178902cd204f967f (diff) | |
p54: fix wmm queue settings
This patch fixes a regression (introduced by
"p54: more definitions form lmac_longbow.h and pda.h")
It turned out that the "ret" variable wasn't initialized and
this caused the following warnings/errors to appear:
wmaster1: failed to set TX queue parameters for queue 2
wmaster1: failed to set TX queue parameters for queue 3
wmaster1: failed to set TX queue parameters for queue 1
wmaster1: failed to set TX queue parameters for queue 0
Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/p54/p54common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 829b3f916db..602392628e4 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c @@ -1728,10 +1728,9 @@ static int p54_conf_tx(struct ieee80211_hw *dev, u16 queue, if ((params) && !(queue > 4)) { P54_SET_QUEUE(priv->qos_params[queue], params->aifs, params->cw_min, params->cw_max, params->txop); + ret = p54_set_edcf(dev); } else ret = -EINVAL; - if (!ret) - ret = p54_set_edcf(dev); mutex_unlock(&priv->conf_mutex); return ret; } |