diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-04-25 14:34:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-25 14:34:25 -0400 |
commit | cfef6047c4027a8448ec8dafeaf2bb362cc882e4 (patch) | |
tree | c254bd25aa8b4b0696b5b5cc45d8e30c7c1bb9dd /drivers/net/wireless/rtlwifi | |
parent | b71d1d426d263b0b6cb5760322efebbfc89d4463 (diff) | |
parent | 73b48099cc265f88fa1255f3f43e52fe6a94fd5c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 12 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/led.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 |
9 files changed, 25 insertions, 16 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 4803f54842e..b259f807ad2 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
@@ -251,14 +251,16 @@ void rtl_init_rfkill(struct ieee80211_hw *hw) | |||
251 | bool blocked; | 251 | bool blocked; |
252 | u8 valid = 0; | 252 | u8 valid = 0; |
253 | 253 | ||
254 | radio_state = rtlpriv->cfg->ops->radio_onoff_checking(hw, &valid); | 254 | /*set init state to on */ |
255 | rtlpriv->rfkill.rfkill_state = 1; | ||
256 | wiphy_rfkill_set_hw_state(hw->wiphy, 0); | ||
255 | 257 | ||
256 | /*set init state to that of switch */ | 258 | radio_state = rtlpriv->cfg->ops->radio_onoff_checking(hw, &valid); |
257 | rtlpriv->rfkill.rfkill_state = radio_state; | ||
258 | printk(KERN_INFO "rtlwifi: wireless switch is %s\n", | ||
259 | rtlpriv->rfkill.rfkill_state ? "on" : "off"); | ||
260 | 259 | ||
261 | if (valid) { | 260 | if (valid) { |
261 | printk(KERN_INFO "rtlwifi: wireless switch is %s\n", | ||
262 | rtlpriv->rfkill.rfkill_state ? "on" : "off"); | ||
263 | |||
262 | rtlpriv->rfkill.rfkill_state = radio_state; | 264 | rtlpriv->rfkill.rfkill_state = radio_state; |
263 | 265 | ||
264 | blocked = (rtlpriv->rfkill.rfkill_state == 1) ? 0 : 1; | 266 | blocked = (rtlpriv->rfkill.rfkill_state == 1) ? 0 : 1; |
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index fbde52d8342..c3dd4cc678b 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -1785,7 +1785,8 @@ void rtl_pci_disconnect(struct pci_dev *pdev) | |||
1785 | 1785 | ||
1786 | rtl_pci_deinit(hw); | 1786 | rtl_pci_deinit(hw); |
1787 | rtl_deinit_core(hw); | 1787 | rtl_deinit_core(hw); |
1788 | rtlpriv->cfg->ops->deinit_sw_leds(hw); | 1788 | if (rtlpriv->cfg->ops->deinit_sw_leds) |
1789 | rtlpriv->cfg->ops->deinit_sw_leds(hw); | ||
1789 | _rtl_pci_io_handler_release(hw); | 1790 | _rtl_pci_io_handler_release(hw); |
1790 | rtlpriv->cfg->ops->deinit_sw_vars(hw); | 1791 | rtlpriv->cfg->ops->deinit_sw_vars(hw); |
1791 | 1792 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c index bb023274414..c228b9ee371 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | |||
@@ -634,7 +634,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw | |||
634 | u8 thermalvalue, delta, delta_lck, delta_iqk; | 634 | u8 thermalvalue, delta, delta_lck, delta_iqk; |
635 | long ele_a, ele_d, temp_cck, val_x, value32; | 635 | long ele_a, ele_d, temp_cck, val_x, value32; |
636 | long val_y, ele_c; | 636 | long val_y, ele_c; |
637 | u8 ofdm_index[2], cck_index, ofdm_index_old[2], cck_index_old; | 637 | u8 ofdm_index[2], cck_index = 0, ofdm_index_old[2], cck_index_old = 0; |
638 | int i; | 638 | int i; |
639 | bool is2t = IS_92C_SERIAL(rtlhal->version); | 639 | bool is2t = IS_92C_SERIAL(rtlhal->version); |
640 | u8 txpwr_level[2] = {0, 0}; | 640 | u8 txpwr_level[2] = {0, 0}; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c index f107660f545..bc9d24134ac 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | |||
@@ -293,7 +293,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw, | |||
293 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 293 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
294 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | 294 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); |
295 | u8 boxnum; | 295 | u8 boxnum; |
296 | u16 box_reg, box_extreg; | 296 | u16 box_reg = 0, box_extreg = 0; |
297 | u8 u1b_tmp; | 297 | u8 u1b_tmp; |
298 | bool isfw_read = false; | 298 | bool isfw_read = false; |
299 | bool bwrite_sucess = false; | 299 | bool bwrite_sucess = false; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/led.c b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c index 7b1da8d7508..d21b934b5c3 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/led.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c | |||
@@ -32,6 +32,14 @@ | |||
32 | #include "reg.h" | 32 | #include "reg.h" |
33 | #include "led.h" | 33 | #include "led.h" |
34 | 34 | ||
35 | static void _rtl92ce_init_led(struct ieee80211_hw *hw, | ||
36 | struct rtl_led *pled, enum rtl_led_pin ledpin) | ||
37 | { | ||
38 | pled->hw = hw; | ||
39 | pled->ledpin = ledpin; | ||
40 | pled->ledon = false; | ||
41 | } | ||
42 | |||
35 | void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) | 43 | void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) |
36 | { | 44 | { |
37 | u8 ledcfg; | 45 | u8 ledcfg; |
@@ -97,10 +105,10 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) | |||
97 | 105 | ||
98 | void rtl92ce_init_sw_leds(struct ieee80211_hw *hw) | 106 | void rtl92ce_init_sw_leds(struct ieee80211_hw *hw) |
99 | { | 107 | { |
100 | } | 108 | struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); |
101 | 109 | ||
102 | void rtl92ce_deinit_sw_leds(struct ieee80211_hw *hw) | 110 | _rtl92ce_init_led(hw, &(pcipriv->ledctl.sw_led0), LED_PIN_LED0); |
103 | { | 111 | _rtl92ce_init_led(hw, &(pcipriv->ledctl.sw_led1), LED_PIN_LED1); |
104 | } | 112 | } |
105 | 113 | ||
106 | void _rtl92ce_sw_led_control(struct ieee80211_hw *hw, | 114 | void _rtl92ce_sw_led_control(struct ieee80211_hw *hw, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/led.h b/drivers/net/wireless/rtlwifi/rtl8192ce/led.h index 10da3018f4b..94332b3af5b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/led.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/led.h | |||
@@ -31,7 +31,6 @@ | |||
31 | #define __RTL92CE_LED_H__ | 31 | #define __RTL92CE_LED_H__ |
32 | 32 | ||
33 | void rtl92ce_init_sw_leds(struct ieee80211_hw *hw); | 33 | void rtl92ce_init_sw_leds(struct ieee80211_hw *hw); |
34 | void rtl92ce_deinit_sw_leds(struct ieee80211_hw *hw); | ||
35 | void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled); | 34 | void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled); |
36 | void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled); | 35 | void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled); |
37 | void rtl92ce_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction); | 36 | void rtl92ce_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c index 669b1168dbe..e301b12e281 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | |||
@@ -202,7 +202,7 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, | |||
202 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 202 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
203 | struct rtl_phy *rtlphy = &(rtlpriv->phy); | 203 | struct rtl_phy *rtlphy = &(rtlpriv->phy); |
204 | struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); | 204 | struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); |
205 | u8 i, chnlgroup, pwr_diff_limit[4]; | 205 | u8 i, chnlgroup = 0, pwr_diff_limit[4]; |
206 | u32 writeVal, customer_limit, rf; | 206 | u32 writeVal, customer_limit, rf; |
207 | 207 | ||
208 | for (rf = 0; rf < 2; rf++) { | 208 | for (rf = 0; rf < 2; rf++) { |
@@ -447,7 +447,7 @@ static bool _rtl92c_phy_rf6052_config_parafile(struct ieee80211_hw *hw) | |||
447 | { | 447 | { |
448 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 448 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
449 | struct rtl_phy *rtlphy = &(rtlpriv->phy); | 449 | struct rtl_phy *rtlphy = &(rtlpriv->phy); |
450 | u32 u4_regvalue; | 450 | u32 u4_regvalue = 0; |
451 | u8 rfpath; | 451 | u8 rfpath; |
452 | bool rtstatus; | 452 | bool rtstatus; |
453 | struct bb_reg_def *pphyreg; | 453 | struct bb_reg_def *pphyreg; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c index b1cc4d44f53..f4e2f3dccca 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | |||
@@ -131,7 +131,6 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { | |||
131 | .enable_hw_sec = rtl92ce_enable_hw_security_config, | 131 | .enable_hw_sec = rtl92ce_enable_hw_security_config, |
132 | .set_key = rtl92ce_set_key, | 132 | .set_key = rtl92ce_set_key, |
133 | .init_sw_leds = rtl92ce_init_sw_leds, | 133 | .init_sw_leds = rtl92ce_init_sw_leds, |
134 | .deinit_sw_leds = rtl92ce_deinit_sw_leds, | ||
135 | .get_bbreg = rtl92c_phy_query_bb_reg, | 134 | .get_bbreg = rtl92c_phy_query_bb_reg, |
136 | .set_bbreg = rtl92c_phy_set_bb_reg, | 135 | .set_bbreg = rtl92c_phy_set_bb_reg, |
137 | .get_rfreg = rtl92ce_phy_query_rf_reg, | 136 | .get_rfreg = rtl92ce_phy_query_rf_reg, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c index 9444e76838c..e43be254782 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | |||
@@ -921,7 +921,7 @@ static void _rtl92cu_init_chipT_queue_priority(struct ieee80211_hw *hw, | |||
921 | u8 out_ep_num, | 921 | u8 out_ep_num, |
922 | u8 queue_sel) | 922 | u8 queue_sel) |
923 | { | 923 | { |
924 | u8 hq_sele; | 924 | u8 hq_sele = 0; |
925 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 925 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
926 | 926 | ||
927 | switch (out_ep_num) { | 927 | switch (out_ep_num) { |