diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 1359a376840..8ec8f7e9ec6 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -997,7 +997,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw, | |||
997 | struct ieee80211_if_init_conf *conf); | 997 | struct ieee80211_if_init_conf *conf); |
998 | void rt2x00mac_remove_interface(struct ieee80211_hw *hw, | 998 | void rt2x00mac_remove_interface(struct ieee80211_hw *hw, |
999 | struct ieee80211_if_init_conf *conf); | 999 | struct ieee80211_if_init_conf *conf); |
1000 | int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf); | 1000 | int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed); |
1001 | int rt2x00mac_config_interface(struct ieee80211_hw *hw, | 1001 | int rt2x00mac_config_interface(struct ieee80211_hw *hw, |
1002 | struct ieee80211_vif *vif, | 1002 | struct ieee80211_vif *vif, |
1003 | struct ieee80211_if_conf *conf); | 1003 | struct ieee80211_if_conf *conf); |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 9e0472bd1ed..697806cf94e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -1245,7 +1245,7 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev) | |||
1245 | /* | 1245 | /* |
1246 | * Reconfigure device. | 1246 | * Reconfigure device. |
1247 | */ | 1247 | */ |
1248 | retval = rt2x00mac_config(rt2x00dev->hw, &rt2x00dev->hw->conf); | 1248 | retval = rt2x00mac_config(rt2x00dev->hw, ~0); |
1249 | if (retval) | 1249 | if (retval) |
1250 | goto exit; | 1250 | goto exit; |
1251 | 1251 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 2c6cc5c374f..da7b49a364f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -335,9 +335,10 @@ void rt2x00mac_remove_interface(struct ieee80211_hw *hw, | |||
335 | } | 335 | } |
336 | EXPORT_SYMBOL_GPL(rt2x00mac_remove_interface); | 336 | EXPORT_SYMBOL_GPL(rt2x00mac_remove_interface); |
337 | 337 | ||
338 | int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) | 338 | int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed) |
339 | { | 339 | { |
340 | struct rt2x00_dev *rt2x00dev = hw->priv; | 340 | struct rt2x00_dev *rt2x00dev = hw->priv; |
341 | struct ieee80211_conf *conf = &hw->conf; | ||
341 | int radio_on; | 342 | int radio_on; |
342 | int status; | 343 | int status; |
343 | 344 | ||