diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2013-09-26 14:25:29 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-10-03 16:36:51 -0400 |
commit | 3764eb72a514cad27ab09fa0b8e591b2b8b7a70b (patch) | |
tree | 2ef336002c1d1ac52b2337fd2da5f7666f29991d /drivers/net/wireless/rtlwifi | |
parent | 5784935dd7d308f15d8600536cfffae9813f16ff (diff) |
rtlwifi: rtl8192ce: Convert driver to use new rtl_phy_scan_operation_backup() routine
Now that rtl_phy_scan_operation_backup() exists, convert rtl8192ce to use it.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h index 80a0893efb4e..aeb268b190c6 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | |||
@@ -207,8 +207,6 @@ void rtl92c_phy_get_txpower_level(struct ieee80211_hw *hw, | |||
207 | void rtl92c_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); | 207 | void rtl92c_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); |
208 | bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, | 208 | bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, |
209 | long power_indbm); | 209 | long power_indbm); |
210 | void rtl92c_phy_scan_operation_backup(struct ieee80211_hw *hw, | ||
211 | u8 operation); | ||
212 | void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw, | 210 | void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw, |
213 | enum nl80211_channel_type ch_type); | 211 | enum nl80211_channel_type ch_type); |
214 | void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw); | 212 | void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c index 14203561b6ee..b790320d2030 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "../wifi.h" | 30 | #include "../wifi.h" |
31 | #include "../core.h" | 31 | #include "../core.h" |
32 | #include "../pci.h" | 32 | #include "../pci.h" |
33 | #include "../base.h" | ||
33 | #include "reg.h" | 34 | #include "reg.h" |
34 | #include "def.h" | 35 | #include "def.h" |
35 | #include "phy.h" | 36 | #include "phy.h" |
@@ -219,7 +220,7 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { | |||
219 | .set_bw_mode = rtl92c_phy_set_bw_mode, | 220 | .set_bw_mode = rtl92c_phy_set_bw_mode, |
220 | .switch_channel = rtl92c_phy_sw_chnl, | 221 | .switch_channel = rtl92c_phy_sw_chnl, |
221 | .dm_watchdog = rtl92c_dm_watchdog, | 222 | .dm_watchdog = rtl92c_dm_watchdog, |
222 | .scan_operation_backup = rtl92c_phy_scan_operation_backup, | 223 | .scan_operation_backup = rtl_phy_scan_operation_backup, |
223 | .set_rf_power_state = rtl92c_phy_set_rf_power_state, | 224 | .set_rf_power_state = rtl92c_phy_set_rf_power_state, |
224 | .led_control = rtl92ce_led_control, | 225 | .led_control = rtl92ce_led_control, |
225 | .set_desc = rtl92ce_set_desc, | 226 | .set_desc = rtl92ce_set_desc, |