diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-03-30 05:58:46 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:35 -0400 |
commit | 1ffb0610be915650cff44c69dc6728215eae08c0 (patch) | |
tree | 383d67665b173e6c1925f6b3b3bc1f38ee19dfed /drivers/net/wireless/ath9k | |
parent | 797fe5cbefdb91f796502677e3a6623262eb9fcd (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/ath9k')
-rw-r--r-- | 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 0c1cc2d62a80..0917def0e081 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, | |||
922 | mod_timer(&sc->ani.timer, | 922 | mod_timer(&sc->ani.timer, |
923 | jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL)); | 923 | jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL)); |
924 | } else { | 924 | } else { |
925 | DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info DISSOC\n"); | 925 | DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info DISASSOC\n"); |
926 | sc->curaid = 0; | 926 | sc->curaid = 0; |
927 | } | 927 | } |
928 | } | 928 | } |
@@ -2036,8 +2036,7 @@ static int ath9k_start(struct ieee80211_hw *hw) | |||
2036 | * here except setup the interrupt mask. | 2036 | * here except setup the interrupt mask. |
2037 | */ | 2037 | */ |
2038 | if (ath_startrecv(sc) != 0) { | 2038 | if (ath_startrecv(sc) != 0) { |
2039 | DPRINTF(sc, ATH_DBG_FATAL, | 2039 | DPRINTF(sc, ATH_DBG_FATAL, "Unable to start recv logic\n"); |
2040 | "Unable to start recv logic\n"); | ||
2041 | r = -EIO; | 2040 | r = -EIO; |
2042 | goto mutex_unlock; | 2041 | goto mutex_unlock; |
2043 | } | 2042 | } |
@@ -2551,6 +2550,8 @@ static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue, | |||
2551 | 2550 | ||
2552 | mutex_lock(&sc->mutex); | 2551 | mutex_lock(&sc->mutex); |
2553 | 2552 | ||
2553 | memset(&qi, 0, sizeof(struct ath9k_tx_queue_info)); | ||
2554 | |||
2554 | qi.tqi_aifs = params->aifs; | 2555 | qi.tqi_aifs = params->aifs; |
2555 | qi.tqi_cwmin = params->cw_min; | 2556 | qi.tqi_cwmin = params->cw_min; |
2556 | qi.tqi_cwmax = params->cw_max; | 2557 | qi.tqi_cwmax = params->cw_max; |