diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 20 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index 3da9a785ab62..a82b30a1996c 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -1503,7 +1503,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, | |||
1503 | } | 1503 | } |
1504 | 1504 | ||
1505 | for (i = 0; i < 14; i++) { | 1505 | for (i = 0; i < 14; i++) { |
1506 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1506 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1507 | "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n", | 1507 | "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n", |
1508 | rf_path, i, | 1508 | rf_path, i, |
1509 | rtlefuse->txpwrlevel_cck[rf_path][i], | 1509 | rtlefuse->txpwrlevel_cck[rf_path][i], |
@@ -1544,11 +1544,11 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, | |||
1544 | & 0xf0) >> 4); | 1544 | & 0xf0) >> 4); |
1545 | } | 1545 | } |
1546 | 1546 | ||
1547 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1547 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1548 | "RF-%d pwrgroup_ht20[%d] = 0x%x\n", | 1548 | "RF-%d pwrgroup_ht20[%d] = 0x%x\n", |
1549 | rf_path, i, | 1549 | rf_path, i, |
1550 | rtlefuse->pwrgroup_ht20[rf_path][i]); | 1550 | rtlefuse->pwrgroup_ht20[rf_path][i]); |
1551 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1551 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1552 | "RF-%d pwrgroup_ht40[%d] = 0x%x\n", | 1552 | "RF-%d pwrgroup_ht40[%d] = 0x%x\n", |
1553 | rf_path, i, | 1553 | rf_path, i, |
1554 | rtlefuse->pwrgroup_ht40[rf_path][i]); | 1554 | rtlefuse->pwrgroup_ht40[rf_path][i]); |
@@ -1589,19 +1589,19 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, | |||
1589 | rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7]; | 1589 | rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7]; |
1590 | 1590 | ||
1591 | for (i = 0; i < 14; i++) | 1591 | for (i = 0; i < 14; i++) |
1592 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1592 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1593 | "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", | 1593 | "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", |
1594 | i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]); | 1594 | i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]); |
1595 | for (i = 0; i < 14; i++) | 1595 | for (i = 0; i < 14; i++) |
1596 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1596 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1597 | "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", | 1597 | "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", |
1598 | i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]); | 1598 | i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]); |
1599 | for (i = 0; i < 14; i++) | 1599 | for (i = 0; i < 14; i++) |
1600 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1600 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1601 | "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", | 1601 | "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", |
1602 | i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]); | 1602 | i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]); |
1603 | for (i = 0; i < 14; i++) | 1603 | for (i = 0; i < 14; i++) |
1604 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1604 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1605 | "RF-B Legacy to HT40 Diff[%d] = 0x%x\n", | 1605 | "RF-B Legacy to HT40 Diff[%d] = 0x%x\n", |
1606 | i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]); | 1606 | i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]); |
1607 | 1607 | ||
@@ -1609,7 +1609,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, | |||
1609 | rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7); | 1609 | rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7); |
1610 | else | 1610 | else |
1611 | rtlefuse->eeprom_regulatory = 0; | 1611 | rtlefuse->eeprom_regulatory = 0; |
1612 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1612 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1613 | "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory); | 1613 | "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory); |
1614 | 1614 | ||
1615 | if (!autoload_fail) { | 1615 | if (!autoload_fail) { |
@@ -1619,7 +1619,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, | |||
1619 | rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI; | 1619 | rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI; |
1620 | rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI; | 1620 | rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI; |
1621 | } | 1621 | } |
1622 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n", | 1622 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, "TSSI_A = 0x%x, TSSI_B = 0x%x\n", |
1623 | rtlefuse->eeprom_tssi[RF90_PATH_A], | 1623 | rtlefuse->eeprom_tssi[RF90_PATH_A], |
1624 | rtlefuse->eeprom_tssi[RF90_PATH_B]); | 1624 | rtlefuse->eeprom_tssi[RF90_PATH_B]); |
1625 | 1625 | ||
@@ -1633,7 +1633,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, | |||
1633 | rtlefuse->apk_thermalmeterignore = true; | 1633 | rtlefuse->apk_thermalmeterignore = true; |
1634 | 1634 | ||
1635 | rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter; | 1635 | rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter; |
1636 | RTPRINT(rtlpriv, FINIT, INIT_TxPower, | 1636 | RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, |
1637 | "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter); | 1637 | "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter); |
1638 | } | 1638 | } |
1639 | 1639 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c index 7347f5931319..14203561b6ee 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | |||
@@ -311,7 +311,7 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = { | |||
311 | 311 | ||
312 | .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW, | 312 | .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW, |
313 | .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT, | 313 | .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT, |
314 | .maps[RTL_IMR_BcnInt] = IMR_BCNINT, | 314 | .maps[RTL_IMR_BCNINT] = IMR_BCNINT, |
315 | .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW, | 315 | .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW, |
316 | .maps[RTL_IMR_RDU] = IMR_RDU, | 316 | .maps[RTL_IMR_RDU] = IMR_RDU, |
317 | .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND, | 317 | .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND, |