Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67d2e2df authored by Jiri Slaby's avatar Jiri Slaby Committed by John W. Linville
Browse files

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: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Nick Kossifidis <mickflemm@gmail.com>
Cc: Luis R. Rodriguez <mcgrof@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 00482973

drivers/net/wireless/ath5k/base.c

+5 −3
Original line number Diff line number Diff line
@@ -2751,6 +2751,11 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, 
		ret = -EOPNOTSUPP;

		goto end;

	}



	/* Set to a reasonable value. Note that this will

	 * be set to mac80211's value at ath5k_config(). */

	sc->bintval = 1000;



	ret = 0;

end:

	mutex_unlock(&sc->lock);
@@ -2795,9 +2800,6 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	struct ath5k_hw *ah = sc->ah;

	int ret;



	/* Set to a reasonable value. Note that this will

	 * be set to mac80211's value at ath5k_config(). */

	sc->bintval = 1000;

	mutex_lock(&sc->lock);

	if (sc->vif != vif) {

		ret = -EIO;