diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2014-02-28 16:16:46 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-04 13:19:36 -0500 |
commit | 2cddad3c737a35118151ec930fb43a710b3646d2 (patch) | |
tree | cd5107d51504b529da37d599f9579789664a4697 /drivers/net/wireless/rtlwifi/rtl8192cu | |
parent | aa45a673b291fd761275493bc15316d79555ed55 (diff) |
rtlwifi: Prepare existing drivers for new driver
A driver for the RTL8723BE will soon be added. This patch adds the
necessary parts to the common headers, and modifies the existing
drivers for those changes.
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/rtl8192cu')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c index 49ad10668078..db7df7f83a02 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | |||
@@ -394,7 +394,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw) | |||
394 | if (rtlefuse->eeprom_did == 0x8176) { | 394 | if (rtlefuse->eeprom_did == 0x8176) { |
395 | if ((rtlefuse->eeprom_svid == 0x103C && | 395 | if ((rtlefuse->eeprom_svid == 0x103C && |
396 | rtlefuse->eeprom_smid == 0x1629)) | 396 | rtlefuse->eeprom_smid == 0x1629)) |
397 | rtlhal->oem_id = RT_CID_819x_HP; | 397 | rtlhal->oem_id = RT_CID_819X_HP; |
398 | else | 398 | else |
399 | rtlhal->oem_id = RT_CID_DEFAULT; | 399 | rtlhal->oem_id = RT_CID_DEFAULT; |
400 | } else { | 400 | } else { |
@@ -405,7 +405,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw) | |||
405 | rtlhal->oem_id = RT_CID_TOSHIBA; | 405 | rtlhal->oem_id = RT_CID_TOSHIBA; |
406 | break; | 406 | break; |
407 | case EEPROM_CID_QMI: | 407 | case EEPROM_CID_QMI: |
408 | rtlhal->oem_id = RT_CID_819x_QMI; | 408 | rtlhal->oem_id = RT_CID_819X_QMI; |
409 | break; | 409 | break; |
410 | case EEPROM_CID_WHQL: | 410 | case EEPROM_CID_WHQL: |
411 | default: | 411 | default: |
@@ -423,14 +423,14 @@ static void _rtl92cu_hal_customized_behavior(struct ieee80211_hw *hw) | |||
423 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | 423 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); |
424 | 424 | ||
425 | switch (rtlhal->oem_id) { | 425 | switch (rtlhal->oem_id) { |
426 | case RT_CID_819x_HP: | 426 | case RT_CID_819X_HP: |
427 | usb_priv->ledctl.led_opendrain = true; | 427 | usb_priv->ledctl.led_opendrain = true; |
428 | break; | 428 | break; |
429 | case RT_CID_819x_Lenovo: | 429 | case RT_CID_819X_LENOVO: |
430 | case RT_CID_DEFAULT: | 430 | case RT_CID_DEFAULT: |
431 | case RT_CID_TOSHIBA: | 431 | case RT_CID_TOSHIBA: |
432 | case RT_CID_CCX: | 432 | case RT_CID_CCX: |
433 | case RT_CID_819x_Acer: | 433 | case RT_CID_819X_ACER: |
434 | case RT_CID_WHQL: | 434 | case RT_CID_WHQL: |
435 | default: | 435 | default: |
436 | break; | 436 | break; |
@@ -1797,7 +1797,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
1797 | e_aci); | 1797 | e_aci); |
1798 | break; | 1798 | break; |
1799 | } | 1799 | } |
1800 | if (rtlusb->acm_method != eAcmWay2_SW) | 1800 | if (rtlusb->acm_method != EACMWAY2_SW) |
1801 | rtlpriv->cfg->ops->set_hw_reg(hw, | 1801 | rtlpriv->cfg->ops->set_hw_reg(hw, |
1802 | HW_VAR_ACM_CTRL, &e_aci); | 1802 | HW_VAR_ACM_CTRL, &e_aci); |
1803 | break; | 1803 | break; |