ath9k: Initialize values when setting up the queue parameters

Also fix a small typo.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 0c1cc2d62a80364595dcd063a71721fb82beac38..0917def0e08103deec07c8e2685c5064a276881f 100644 (file)
--- 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;
        }
 }
@@ -2036,8 +2036,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;
        }
@@ -2551,6 +2550,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;