diff options
Diffstat (limited to 'drivers/net/wireless/ath5k/base.c')
-rw-r--r-- | drivers/net/wireless/ath5k/base.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 9e47d727e220..fcd688765d04 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -219,8 +219,7 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, | |||
219 | struct ieee80211_if_init_conf *conf); | 219 | struct ieee80211_if_init_conf *conf); |
220 | static void ath5k_remove_interface(struct ieee80211_hw *hw, | 220 | static void ath5k_remove_interface(struct ieee80211_hw *hw, |
221 | struct ieee80211_if_init_conf *conf); | 221 | struct ieee80211_if_init_conf *conf); |
222 | static int ath5k_config(struct ieee80211_hw *hw, | 222 | static int ath5k_config(struct ieee80211_hw *hw, u32 changed); |
223 | struct ieee80211_conf *conf); | ||
224 | static int ath5k_config_interface(struct ieee80211_hw *hw, | 223 | static int ath5k_config_interface(struct ieee80211_hw *hw, |
225 | struct ieee80211_vif *vif, | 224 | struct ieee80211_vif *vif, |
226 | struct ieee80211_if_conf *conf); | 225 | struct ieee80211_if_conf *conf); |
@@ -2780,10 +2779,10 @@ end: | |||
2780 | * TODO: Phy disable/diversity etc | 2779 | * TODO: Phy disable/diversity etc |
2781 | */ | 2780 | */ |
2782 | static int | 2781 | static int |
2783 | ath5k_config(struct ieee80211_hw *hw, | 2782 | ath5k_config(struct ieee80211_hw *hw, u32 changed) |
2784 | struct ieee80211_conf *conf) | ||
2785 | { | 2783 | { |
2786 | struct ath5k_softc *sc = hw->priv; | 2784 | struct ath5k_softc *sc = hw->priv; |
2785 | struct ieee80211_conf *conf = &hw->conf; | ||
2787 | 2786 | ||
2788 | sc->bintval = conf->beacon_int; | 2787 | sc->bintval = conf->beacon_int; |
2789 | sc->power_level = conf->power_level; | 2788 | sc->power_level = conf->power_level; |