2009-03-30 10:02:57

by Sujith

[permalink] [raw]
Subject: [PATCH 13/17] ath9k: Initialize values when setting up the queue parameters

Also fix a small typo.

Signed-off-by: Sujith <[email protected]>
---
drivers/net/wireless/ath9k/main.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index d510c4e..6db2131 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -922,7 +922,7 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
mod_timer(&sc->ani.timer,
jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
} else {
- DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info DISSOC\n");
+ DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info DISASSOC\n");
sc->curaid = 0;
}
}
@@ -2037,8 +2037,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
* here except setup the interrupt mask.
*/
if (ath_startrecv(sc) != 0) {
- DPRINTF(sc, ATH_DBG_FATAL,
- "Unable to start recv logic\n");
+ DPRINTF(sc, ATH_DBG_FATAL, "Unable to start recv logic\n");
r = -EIO;
goto mutex_unlock;
}
@@ -2552,6 +2551,8 @@ static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,

mutex_lock(&sc->mutex);

+ memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
+
qi.tqi_aifs = params->aifs;
qi.tqi_cwmin = params->cw_min;
qi.tqi_cwmax = params->cw_max;
--
1.6.2.1