aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-08-18 15:45:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-08-26 20:06:31 -0400
commit67d2e2dfab31b4c0497ce8a84d63efc931f10bb7 (patch)
tree5ea62c98b253cb013838e405785ee203f64f8dad /drivers
parent004829730cb1b03abe7555e1c1faadec62cbcf6f (diff)
Ath5k: fix bintval setup
bintval is set to the initial value at .config_interface which is too late, since it overwrites previously set value from .config. Move the initialization to the .add_interface. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Nick Kossifidis <mickflemm@gmail.com> Cc: Luis R. Rodriguez <mcgrof@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath5k/base.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 7bc012fca059..0676c6d84383 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -2751,6 +2751,11 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
2751 ret = -EOPNOTSUPP; 2751 ret = -EOPNOTSUPP;
2752 goto end; 2752 goto end;
2753 } 2753 }
2754
2755 /* Set to a reasonable value. Note that this will
2756 * be set to mac80211's value at ath5k_config(). */
2757 sc->bintval = 1000;
2758
2754 ret = 0; 2759 ret = 0;
2755end: 2760end:
2756 mutex_unlock(&sc->lock); 2761 mutex_unlock(&sc->lock);
@@ -2795,9 +2800,6 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
2795 struct ath5k_hw *ah = sc->ah; 2800 struct ath5k_hw *ah = sc->ah;
2796 int ret; 2801 int ret;
2797 2802
2798 /* Set to a reasonable value. Note that this will
2799 * be set to mac80211's value at ath5k_config(). */
2800 sc->bintval = 1000;
2801 mutex_lock(&sc->lock); 2803 mutex_lock(&sc->lock);
2802 if (sc->vif != vif) { 2804 if (sc->vif != vif) {
2803 ret = -EIO; 2805 ret = -EIO;