Skip to content

L
linux
Commit 0822339b authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8192e: fix coding style issues (merge broken strings) 

Fix checkpatch.pl warnings:
- 'WARNING: quoted string split across lines'
- 'WARNING: break quoted strings at a space character'
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5133e75
Hide whitespace changes
Inline Side-by-side
Showing with 560 additions and 511 deletions
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
View file @ 0822339b
...@@ -47,8 +47,8 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, ...@@ -47,8 +47,8 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev,
0x0e, bMask12Bits, 0x021); 0x0e, bMask12Bits, 0x021);
} else { } else {
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): " RT_TRACE(COMP_ERR,
"unknown hardware version\n"); "PHY_SetRF8256Bandwidth(): unknown hardware version\n");
} }
break; break;
...@@ -66,15 +66,16 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, ...@@ -66,15 +66,16 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev,
0x0e, bMask12Bits, 0x0e1); 0x0e, bMask12Bits, 0x0e1);
} else { } else {
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): " RT_TRACE(COMP_ERR,
"unknown hardware version\n"); "PHY_SetRF8256Bandwidth(): unknown hardware version\n");
} }
break; break;
default: default:
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown " RT_TRACE(COMP_ERR,
"Bandwidth: %#X\n", Bandwidth); "PHY_SetRF8256Bandwidth(): unknown Bandwidth: %#X\n",
Bandwidth);
break; break;
} }
...@@ -138,8 +139,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -138,8 +139,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
rtStatus = rtl8192_phy_checkBBAndRF(dev, HW90_BLOCK_RF, rtStatus = rtl8192_phy_checkBBAndRF(dev, HW90_BLOCK_RF,
(enum rf90_radio_path)eRFPath); (enum rf90_radio_path)eRFPath);
if (!rtStatus) { if (!rtStatus) {
RT_TRACE(COMP_ERR, "PHY_RF8256_Config():Check " RT_TRACE(COMP_ERR,
"Radio[%d] Fail!!\n", eRFPath); "PHY_RF8256_Config():Check Radio[%d] Fail!!\n",
eRFPath);
goto phy_RF8256_Config_ParaFile_Fail; goto phy_RF8256_Config_ParaFile_Fail;
} }
...@@ -155,9 +157,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -155,9 +157,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, RegOffSetToBeCheck,
bMask12Bits); bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final " RT_TRACE(COMP_RF,
"value: %x\n", eRFPath, "RF %d %d register final value: %x\n",
RegOffSetToBeCheck, RF3_Final_Value); eRFPath, RegOffSetToBeCheck,
RF3_Final_Value);
RetryTimes--; RetryTimes--;
} }
break; break;
...@@ -170,9 +173,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -170,9 +173,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, RegOffSetToBeCheck,
bMask12Bits); bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final " RT_TRACE(COMP_RF,
"value: %x\n", eRFPath, "RF %d %d register final value: %x\n",
RegOffSetToBeCheck, RF3_Final_Value); eRFPath, RegOffSetToBeCheck,
RF3_Final_Value);
RetryTimes--; RetryTimes--;
} }
break; break;
...@@ -185,9 +189,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -185,9 +189,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, RegOffSetToBeCheck,
bMask12Bits); bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final " RT_TRACE(COMP_RF,
"value: %x\n", eRFPath, "RF %d %d register final value: %x\n",
RegOffSetToBeCheck, RF3_Final_Value); eRFPath, RegOffSetToBeCheck,
RF3_Final_Value);
RetryTimes--; RetryTimes--;
} }
break; break;
...@@ -199,9 +204,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -199,9 +204,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, bMask12Bits); RegOffSetToBeCheck, bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final " RT_TRACE(COMP_RF,
"value: %x\n", eRFPath, "RF %d %d register final value: %x\n",
RegOffSetToBeCheck, RF3_Final_Value); eRFPath, RegOffSetToBeCheck,
RF3_Final_Value);
RetryTimes--; RetryTimes--;
} }
break; break;
...@@ -221,8 +227,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -221,8 +227,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
} }
if (ret) { if (ret) {
RT_TRACE(COMP_ERR, "phy_RF8256_Config_ParaFile():" RT_TRACE(COMP_ERR,
"Radio[%d] Fail!!", eRFPath); "phy_RF8256_Config_ParaFile():Radio[%d] Fail!!",
eRFPath);
goto phy_RF8256_Config_ParaFile_Fail; goto phy_RF8256_Config_ParaFile_Fail;
} }
......
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
View file @ 0822339b
...@@ -332,44 +332,44 @@ u32 cmpk_message_handle_rx(struct net_device *dev, ...@@ -332,44 +332,44 @@ u32 cmpk_message_handle_rx(struct net_device *dev,
switch (element_id) { switch (element_id) {
case RX_TX_FEEDBACK: case RX_TX_FEEDBACK:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():" RT_TRACE(COMP_CMDPKT,
"RX_TX_FEEDBACK\n"); "---->cmpk_message_handle_rx():RX_TX_FEEDBACK\n");
cmpk_handle_tx_feedback(dev, pcmd_buff); cmpk_handle_tx_feedback(dev, pcmd_buff);
cmd_length = CMPK_RX_TX_FB_SIZE; cmd_length = CMPK_RX_TX_FB_SIZE;
break; break;
case RX_INTERRUPT_STATUS: case RX_INTERRUPT_STATUS:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():" RT_TRACE(COMP_CMDPKT,
"RX_INTERRUPT_STATUS\n"); "---->cmpk_message_handle_rx():RX_INTERRUPT_STATUS\n");
cmpk_handle_interrupt_status(dev, pcmd_buff); cmpk_handle_interrupt_status(dev, pcmd_buff);
cmd_length = sizeof(struct cmpk_intr_sta); cmd_length = sizeof(struct cmpk_intr_sta);
break; break;
case BOTH_QUERY_CONFIG: case BOTH_QUERY_CONFIG:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():" RT_TRACE(COMP_CMDPKT,
"BOTH_QUERY_CONFIG\n"); "---->cmpk_message_handle_rx():BOTH_QUERY_CONFIG\n");
cmpk_handle_query_config_rx(dev, pcmd_buff); cmpk_handle_query_config_rx(dev, pcmd_buff);
cmd_length = CMPK_BOTH_QUERY_CONFIG_SIZE; cmd_length = CMPK_BOTH_QUERY_CONFIG_SIZE;
break; break;
case RX_TX_STATUS: case RX_TX_STATUS:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():" RT_TRACE(COMP_CMDPKT,
"RX_TX_STATUS\n"); "---->cmpk_message_handle_rx():RX_TX_STATUS\n");
cmpk_handle_tx_status(dev, pcmd_buff); cmpk_handle_tx_status(dev, pcmd_buff);
cmd_length = CMPK_RX_TX_STS_SIZE; cmd_length = CMPK_RX_TX_STS_SIZE;
break; break;
case RX_TX_PER_PKT_FEEDBACK: case RX_TX_PER_PKT_FEEDBACK:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():" RT_TRACE(COMP_CMDPKT,
"RX_TX_PER_PKT_FEEDBACK\n"); "---->cmpk_message_handle_rx():RX_TX_PER_PKT_FEEDBACK\n");
cmd_length = CMPK_RX_TX_FB_SIZE; cmd_length = CMPK_RX_TX_FB_SIZE;
break; break;
case RX_TX_RATE_HISTORY: case RX_TX_RATE_HISTORY:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():" RT_TRACE(COMP_CMDPKT,
"RX_TX_HISTORY\n"); "---->cmpk_message_handle_rx():RX_TX_HISTORY\n");
cmpk_handle_tx_rate_history(dev, pcmd_buff); cmpk_handle_tx_rate_history(dev, pcmd_buff);
cmd_length = CMPK_TX_RAHIS_SIZE; cmd_length = CMPK_TX_RAHIS_SIZE;
break; break;
default: default:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():" RT_TRACE(COMP_CMDPKT,
"unknown CMD Element\n"); "---->cmpk_message_handle_rx():unknown CMD Element\n");
return 1; return 1;
} }
......
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
View file @ 0822339b
...@@ -263,9 +263,9 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val) ...@@ -263,9 +263,9 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
break; break;
default: default:
RT_TRACE(COMP_QOS, "SetHwReg8185(): [HW_VAR_" RT_TRACE(COMP_QOS,
"ACM_CTRL] acm set failed: eACI is " "SetHwReg8185(): [HW_VAR_ACM_CTRL] acm set failed: eACI is %d\n",
"%d\n", eACI); eACI);
break; break;
} }
} else { } else {
...@@ -287,8 +287,9 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val) ...@@ -287,8 +287,9 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
} }
} }
RT_TRACE(COMP_QOS, "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write" RT_TRACE(COMP_QOS,
" 0x%X\n", AcmCtrl); "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
AcmCtrl);
write_nic_byte(dev, AcmHwCtrl, AcmCtrl); write_nic_byte(dev, AcmHwCtrl, AcmCtrl);
break; break;
} }
...@@ -448,12 +449,12 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) ...@@ -448,12 +449,12 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
usValue = EEPROM_Default_TxPower; usValue = EEPROM_Default_TxPower;
*((u16 *)(&priv->EEPROMTxPowerLevelCCK[i])) = *((u16 *)(&priv->EEPROMTxPowerLevelCCK[i])) =
usValue; usValue;
RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index" RT_TRACE(COMP_INIT,
" %d = 0x%02x\n", i, "CCK Tx Power Level, Index %d = 0x%02x\n",
priv->EEPROMTxPowerLevelCCK[i]); i, priv->EEPROMTxPowerLevelCCK[i]);
RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index" RT_TRACE(COMP_INIT,
" %d = 0x%02x\n", i+1, "CCK Tx Power Level, Index %d = 0x%02x\n",
priv->EEPROMTxPowerLevelCCK[i+1]); i+1, priv->EEPROMTxPowerLevelCCK[i+1]);
} }
for (i = 0; i < 14; i += 2) { for (i = 0; i < 14; i += 2) {
if (!priv->AutoloadFailFlag) if (!priv->AutoloadFailFlag)
...@@ -464,11 +465,12 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) ...@@ -464,11 +465,12 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
usValue = EEPROM_Default_TxPower; usValue = EEPROM_Default_TxPower;
*((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i])) *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i]))
= usValue; = usValue;
RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level," RT_TRACE(COMP_INIT,
" Index %d = 0x%02x\n", i, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n",
priv->EEPROMTxPowerLevelOFDM24G[i]); i, priv->EEPROMTxPowerLevelOFDM24G[i]);
RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level," RT_TRACE(COMP_INIT,
" Index %d = 0x%02x\n", i + 1, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n",
i + 1,
priv->EEPROMTxPowerLevelOFDM24G[i+1]); priv->EEPROMTxPowerLevelOFDM24G[i+1]);
} }
} }
...@@ -525,21 +527,21 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) ...@@ -525,21 +527,21 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
priv->EEPROMRfCOfdmChnlTxPwLevel[2]; priv->EEPROMRfCOfdmChnlTxPwLevel[2];
} }
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_A" RT_TRACE(COMP_INIT,
"[%d] = 0x%x\n", i, "priv->TxPowerLevelCCK_A[%d] = 0x%x\n",
priv->TxPowerLevelCCK_A[i]); i, priv->TxPowerLevelCCK_A[i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM" RT_TRACE(COMP_INIT,
"24G_A[%d] = 0x%x\n", i, "priv->TxPowerLevelOFDM24G_A[%d] = 0x%x\n",
priv->TxPowerLevelOFDM24G_A[i]); i, priv->TxPowerLevelOFDM24G_A[i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_C" RT_TRACE(COMP_INIT,
"[%d] = 0x%x\n", i, "priv->TxPowerLevelCCK_C[%d] = 0x%x\n",
priv->TxPowerLevelCCK_C[i]); i, priv->TxPowerLevelCCK_C[i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM" RT_TRACE(COMP_INIT,
"24G_C[%d] = 0x%x\n", i, "priv->TxPowerLevelOFDM24G_C[%d] = 0x%x\n",
priv->TxPowerLevelOFDM24G_C[i]); i, priv->TxPowerLevelOFDM24G_C[i]);
priv->LegacyHTTxPowerDiff = priv->LegacyHTTxPowerDiff =
priv->EEPROMLegacyHTTxPowerDiff; priv->EEPROMLegacyHTTxPowerDiff;
priv->AntennaTxPwDiff[0] = 0; priv->AntennaTxPwDiff[0] = 0;
...@@ -735,8 +737,9 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -735,8 +737,9 @@ bool rtl8192_adapter_start(struct net_device *dev)
else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY) else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)
ulRegRead |= CPU_GEN_FIRMWARE_RESET; ulRegRead |= CPU_GEN_FIRMWARE_RESET;
else else
RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)" RT_TRACE(COMP_ERR,
"\n", __func__, priv->pFirmware->firmware_status); "ERROR in %s(): undefined firmware state(%d)\n",
__func__, priv->pFirmware->firmware_status);
write_nic_dword(dev, CPU_GEN, ulRegRead); write_nic_dword(dev, CPU_GEN, ulRegRead);
...@@ -766,8 +769,8 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -766,8 +769,8 @@ bool rtl8192_adapter_start(struct net_device *dev)
else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK) else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK)
ulRegRead |= CPU_CCK_LOOPBACK; ulRegRead |= CPU_CCK_LOOPBACK;
else else
RT_TRACE(COMP_ERR, "Serious error: wrong loopback" RT_TRACE(COMP_ERR,
" mode setting\n"); "Serious error: wrong loopback mode setting\n");
write_nic_dword(dev, CPU_GEN, ulRegRead); write_nic_dword(dev, CPU_GEN, ulRegRead);
...@@ -883,15 +886,15 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -883,15 +886,15 @@ bool rtl8192_adapter_start(struct net_device *dev)
__func__); __func__);
MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW, true); MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW, true);
} else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) { } else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) {
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for" RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER),
" RfOffReason(%d) ----------\n", __func__, "%s(): Turn off RF for RfOffReason(%d) ----------\n",
priv->rtllib->RfOffReason); __func__, priv->rtllib->RfOffReason);
MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason, MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
true); true);
} else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) { } else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) {
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for" RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER),
" RfOffReason(%d) ----------\n", __func__, "%s(): Turn off RF for RfOffReason(%d) ----------\n",
priv->rtllib->RfOffReason); __func__, priv->rtllib->RfOffReason);
MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason, MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
true); true);
} else { } else {
...@@ -939,17 +942,17 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -939,17 +942,17 @@ bool rtl8192_adapter_start(struct net_device *dev)
priv->CCKPresentAttentuation_difference = 0; priv->CCKPresentAttentuation_difference = 0;
priv->CCKPresentAttentuation = priv->CCKPresentAttentuation =
priv->CCKPresentAttentuation_20Mdefault; priv->CCKPresentAttentuation_20Mdefault;
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpower" RT_TRACE(COMP_POWER_TRACKING,
"trackingindex_initial = %d\n", "priv->rfa_txpowertrackingindex_initial = %d\n",
priv->rfa_txpowertrackingindex); priv->rfa_txpowertrackingindex);
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpower" RT_TRACE(COMP_POWER_TRACKING,
"trackingindex_real__initial = %d\n", "priv->rfa_txpowertrackingindex_real__initial = %d\n",
priv->rfa_txpowertrackingindex_real); priv->rfa_txpowertrackingindex_real);
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresent" RT_TRACE(COMP_POWER_TRACKING,
"Attentuation_difference_initial = %d\n", "priv->CCKPresentAttentuation_difference_initial = %d\n",
priv->CCKPresentAttentuation_difference); priv->CCKPresentAttentuation_difference);
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresent" RT_TRACE(COMP_POWER_TRACKING,
"Attentuation_initial = %d\n", "priv->CCKPresentAttentuation_initial = %d\n",
priv->CCKPresentAttentuation); priv->CCKPresentAttentuation);
priv->btxpower_tracking = false; priv->btxpower_tracking = false;
} }
...@@ -1169,8 +1172,9 @@ static u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority) ...@@ -1169,8 +1172,9 @@ static u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)
QueueSelect = QSLT_HIGH; QueueSelect = QSLT_HIGH;
break; break;
default: default:
RT_TRACE(COMP_ERR, "TransmitTCB(): Impossible Queue Selection:" RT_TRACE(COMP_ERR,
" %d\n", QueueID); "TransmitTCB(): Impossible Queue Selection: %d\n",
QueueID);
break; break;
} }
return QueueSelect; return QueueSelect;
...@@ -1361,9 +1365,10 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate) ...@@ -1361,9 +1365,10 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)
break; break;
default: default:
RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported" RT_TRACE(COMP_RECV,
"Rate [%x], bIsHT = %d!!!\n", rate, bIsHT); "HwRateToMRate90(): Non supportedRate [%x], bIsHT = %d!!!\n",
break; rate, bIsHT);
break;
} }
} else { } else {
...@@ -1421,8 +1426,9 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate) ...@@ -1421,8 +1426,9 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)
break; break;
default: default:
RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported " RT_TRACE(COMP_RECV,
"Rate [%x], bIsHT = %d!!!\n", rate, bIsHT); "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n",
rate, bIsHT);
break; break;
} }
} }
...@@ -1737,8 +1743,8 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, ...@@ -1737,8 +1743,8 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev, if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev,
rfpath)) rfpath))
continue; continue;
RT_TRACE(COMP_DBG, "Jacken -> pPreviousstats->RxMIMO" RT_TRACE(COMP_DBG,
"SignalStrength[rfpath] = %d\n", "Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath] = %d\n",
prev_st->RxMIMOSignalStrength[rfpath]); prev_st->RxMIMOSignalStrength[rfpath]);
if (priv->stats.rx_rssi_percentage[rfpath] == 0) { if (priv->stats.rx_rssi_percentage[rfpath] == 0) {
priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath] =
...@@ -1761,8 +1767,8 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, ...@@ -1761,8 +1767,8 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
(prev_st->RxMIMOSignalStrength[rfpath])) / (prev_st->RxMIMOSignalStrength[rfpath])) /
(RX_SMOOTH); (RX_SMOOTH);
} }
RT_TRACE(COMP_DBG, "Jacken -> priv->RxStats.RxRSSI" RT_TRACE(COMP_DBG,
"Percentage[rfPath] = %d\n", "Jacken -> priv->RxStats.RxRSSIPercentage[rfPath] = %d\n",
priv->stats.rx_rssi_percentage[rfpath]); priv->stats.rx_rssi_percentage[rfpath]);
} }
} }
...@@ -2073,8 +2079,8 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev, ...@@ -2073,8 +2079,8 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev,
pDrvInfo); pDrvInfo);
if (pDrvInfo->FirstAGGR == 1 || pDrvInfo->PartAggr == 1) if (pDrvInfo->FirstAGGR == 1 || pDrvInfo->PartAggr == 1)
RT_TRACE(COMP_RXDESC, "pDrvInfo->FirstAGGR = %d," RT_TRACE(COMP_RXDESC,
" pDrvInfo->PartAggr = %d\n", "pDrvInfo->FirstAGGR = %d, pDrvInfo->PartAggr = %d\n",
pDrvInfo->FirstAGGR, pDrvInfo->PartAggr); pDrvInfo->FirstAGGR, pDrvInfo->PartAggr);
skb_trim(skb, skb->len - 4/*sCrcLng*/); skb_trim(skb, skb->len - 4/*sCrcLng*/);
......
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
View file @ 0822339b
...@@ -83,8 +83,8 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, ...@@ -83,8 +83,8 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
if (!priv->rtllib->check_nic_enough_desc(dev, tcb_desc->queue_index) || if (!priv->rtllib->check_nic_enough_desc(dev, tcb_desc->queue_index) ||
(!skb_queue_empty(&priv->rtllib->skb_waitQ[tcb_desc->queue_index])) || (!skb_queue_empty(&priv->rtllib->skb_waitQ[tcb_desc->queue_index])) ||
(priv->rtllib->queue_stop)) { (priv->rtllib->queue_stop)) {
RT_TRACE(COMP_FIRMWARE, "===================> tx " RT_TRACE(COMP_FIRMWARE,
"full!\n"); "===================> tx full!\n");
skb_queue_tail(&priv->rtllib->skb_waitQ skb_queue_tail(&priv->rtllib->skb_waitQ
[tcb_desc->queue_index], skb); [tcb_desc->queue_index], skb);
} else { } else {
...@@ -196,8 +196,8 @@ static bool firmware_check_ready(struct net_device *dev, ...@@ -196,8 +196,8 @@ static bool firmware_check_ready(struct net_device *dev,
if (rt_status) if (rt_status)
pfirmware->firmware_status = FW_STATUS_3_TURNON_CPU; pfirmware->firmware_status = FW_STATUS_3_TURNON_CPU;
else else
RT_TRACE(COMP_FIRMWARE, "CPUcheck_maincodeok_turnon" RT_TRACE(COMP_FIRMWARE,
"CPU fail!\n"); "CPUcheck_maincodeok_turnonCPU fail!\n");
break; break;
...@@ -209,8 +209,9 @@ static bool firmware_check_ready(struct net_device *dev, ...@@ -209,8 +209,9 @@ static bool firmware_check_ready(struct net_device *dev,
if (rt_status) if (rt_status)
pfirmware->firmware_status = FW_STATUS_5_READY; pfirmware->firmware_status = FW_STATUS_5_READY;
else else
RT_TRACE(COMP_FIRMWARE, "CPUcheck_firmware_ready fail" RT_TRACE(COMP_FIRMWARE,
"(%d)!\n", rt_status); "CPUcheck_firmware_ready fail(%d)!\n",
rt_status);
break; break;
default: default:
...@@ -245,8 +246,8 @@ bool init_firmware(struct net_device *dev) ...@@ -245,8 +246,8 @@ bool init_firmware(struct net_device *dev)
rst_opt = OPT_FIRMWARE_RESET; rst_opt = OPT_FIRMWARE_RESET;
starting_state = FW_INIT_STEP2_DATA; starting_state = FW_INIT_STEP2_DATA;
} else { } else {
RT_TRACE(COMP_FIRMWARE, "PlatformInitFirmware: undefined" RT_TRACE(COMP_FIRMWARE,
" firmware state\n"); "PlatformInitFirmware: undefined firmware state\n");
} }
for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA;
...@@ -265,14 +266,14 @@ bool init_firmware(struct net_device *dev) ...@@ -265,14 +266,14 @@ bool init_firmware(struct net_device *dev)
fw_name[init_step], fw_name[init_step],
&priv->pdev->dev); &priv->pdev->dev);
if (rc < 0) { if (rc < 0) {
RT_TRACE(COMP_FIRMWARE, "request firmware fail!\n"); RT_TRACE(COMP_FIRMWARE,
"request firmware fail!\n");
goto download_firmware_fail; goto download_firmware_fail;
} }
if (fw_entry->size > if (fw_entry->size >
sizeof(pfirmware->firmware_buf[init_step])) { sizeof(pfirmware->firmware_buf[init_step])) {
RT_TRACE(COMP_FIRMWARE, "img file size " RT_TRACE(COMP_FIRMWARE,
"exceed the container struct " "img file size exceed the container struct buffer fail!\n");
"buffer fail!\n");
goto download_firmware_fail; goto download_firmware_fail;
} }
......
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
View file @ 0822339b
...@@ -136,8 +136,8 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev, ...@@ -136,8 +136,8 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev,
} else } else
NewOffset = Offset; NewOffset = Offset;
} else { } else {
RT_TRACE((COMP_PHY|COMP_ERR), "check RF type here, need" RT_TRACE((COMP_PHY|COMP_ERR),
" to be 8256\n"); "check RF type here, need to be 8256\n");
NewOffset = Offset; NewOffset = Offset;
} }
rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, bLSSIReadAddress, rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, bLSSIReadAddress,
...@@ -192,8 +192,8 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev, ...@@ -192,8 +192,8 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev,
} else } else
NewOffset = Offset; NewOffset = Offset;
} else { } else {
RT_TRACE((COMP_PHY|COMP_ERR), "check RF type here, need to be" RT_TRACE((COMP_PHY|COMP_ERR),
" 8256\n"); "check RF type here, need to be 8256\n");
NewOffset = Offset; NewOffset = Offset;
} }
...@@ -348,8 +348,8 @@ void rtl8192_phy_configmac(struct net_device *dev) ...@@ -348,8 +348,8 @@ void rtl8192_phy_configmac(struct net_device *dev)
pdwArray = Rtl819XMACPHY_Array; pdwArray = Rtl819XMACPHY_Array;
} }
for (i = 0; i < dwArrayLen; i += 3) { for (i = 0; i < dwArrayLen; i += 3) {
RT_TRACE(COMP_DBG, "The Rtl8190MACPHY_Array[0] is %x Rtl8190MAC" RT_TRACE(COMP_DBG,
"PHY_Array[1] is %x Rtl8190MACPHY_Array[2] is %x\n", "The Rtl8190MACPHY_Array[0] is %x Rtl8190MACPHY_Array[1] is %x Rtl8190MACPHY_Array[2] is %x\n",
pdwArray[i], pdwArray[i+1], pdwArray[i+2]); pdwArray[i], pdwArray[i+1], pdwArray[i+2]);
if (pdwArray[i] == 0x318) if (pdwArray[i] == 0x318)
pdwArray[i+2] = 0x00000800; pdwArray[i+2] = 0x00000800;
...@@ -383,8 +383,8 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType) ...@@ -383,8 +383,8 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType)
rtl8192_setBBreg(dev, Rtl819XPHY_REGArray_Table[i], rtl8192_setBBreg(dev, Rtl819XPHY_REGArray_Table[i],
bMaskDWord, bMaskDWord,
Rtl819XPHY_REGArray_Table[i+1]); Rtl819XPHY_REGArray_Table[i+1]);
RT_TRACE(COMP_DBG, "i: %x, The Rtl819xUsbPHY_REGArray" RT_TRACE(COMP_DBG,
"[0] is %x Rtl819xUsbPHY_REGArray[1] is %x\n", "i: %x, The Rtl819xUsbPHY_REGArray[0] is %x Rtl819xUsbPHY_REGArray[1] is %x\n",
i, Rtl819XPHY_REGArray_Table[i], i, Rtl819XPHY_REGArray_Table[i],
Rtl819XPHY_REGArray_Table[i+1]); Rtl819XPHY_REGArray_Table[i+1]);
} }
...@@ -393,9 +393,9 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType) ...@@ -393,9 +393,9 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType)
rtl8192_setBBreg(dev, Rtl819XAGCTAB_Array_Table[i], rtl8192_setBBreg(dev, Rtl819XAGCTAB_Array_Table[i],
bMaskDWord, bMaskDWord,
Rtl819XAGCTAB_Array_Table[i+1]); Rtl819XAGCTAB_Array_Table[i+1]);
RT_TRACE(COMP_DBG, "i:%x, The rtl819XAGCTAB_Array[0] " RT_TRACE(COMP_DBG,
"is %x rtl819XAGCTAB_Array[1] is %x\n", i, "i:%x, The rtl819XAGCTAB_Array[0] is %x rtl819XAGCTAB_Array[1] is %x\n",
Rtl819XAGCTAB_Array_Table[i], i, Rtl819XAGCTAB_Array_Table[i],
Rtl819XAGCTAB_Array_Table[i+1]); Rtl819XAGCTAB_Array_Table[i+1]);
} }
} }
...@@ -511,8 +511,8 @@ bool rtl8192_phy_checkBBAndRF(struct net_device *dev, ...@@ -511,8 +511,8 @@ bool rtl8192_phy_checkBBAndRF(struct net_device *dev,
for (i = 0; i < CheckTimes; i++) { for (i = 0; i < CheckTimes; i++) {
switch (CheckBlock) { switch (CheckBlock) {
case HW90_BLOCK_MAC: case HW90_BLOCK_MAC:
RT_TRACE(COMP_ERR, "PHY_CheckBBRFOK(): Never Write " RT_TRACE(COMP_ERR,
"0x100 here!"); "PHY_CheckBBRFOK(): Never Write 0x100 here!");
break; break;
case HW90_BLOCK_PHY0: case HW90_BLOCK_PHY0:
...@@ -541,8 +541,9 @@ bool rtl8192_phy_checkBBAndRF(struct net_device *dev, ...@@ -541,8 +541,9 @@ bool rtl8192_phy_checkBBAndRF(struct net_device *dev,
if (dwRegRead != WriteData[i]) { if (dwRegRead != WriteData[i]) {
RT_TRACE(COMP_ERR, "====>error=====dwRegRead: %x, " RT_TRACE(COMP_ERR,
"WriteData: %x\n", dwRegRead, WriteData[i]); "====>error=====dwRegRead: %x, WriteData: %x\n",
dwRegRead, WriteData[i]);
ret = false; ret = false;
break; break;
} }
...@@ -570,8 +571,9 @@ static bool rtl8192_BB_Config_ParaFile(struct net_device *dev) ...@@ -570,8 +571,9 @@ static bool rtl8192_BB_Config_ParaFile(struct net_device *dev)
(enum hw90_block)eCheckItem, (enum hw90_block)eCheckItem,
(enum rf90_radio_path)0); (enum rf90_radio_path)0);
if (!rtStatus) { if (!rtStatus) {
RT_TRACE((COMP_ERR | COMP_PHY), "PHY_RF8256_Config():" RT_TRACE((COMP_ERR | COMP_PHY),
"Check PHY%d Fail!!\n", eCheckItem-1); "PHY_RF8256_Config():Check PHY%d Fail!!\n",
eCheckItem-1);
return rtStatus; return rtStatus;
} }
} }
...@@ -628,8 +630,8 @@ void rtl8192_phy_getTxPower(struct net_device *dev) ...@@ -628,8 +630,8 @@ void rtl8192_phy_getTxPower(struct net_device *dev)
priv->DefaultInitialGain[1] = read_nic_byte(dev, rOFDM0_XBAGCCore1); priv->DefaultInitialGain[1] = read_nic_byte(dev, rOFDM0_XBAGCCore1);
priv->DefaultInitialGain[2] = read_nic_byte(dev, rOFDM0_XCAGCCore1); priv->DefaultInitialGain[2] = read_nic_byte(dev, rOFDM0_XCAGCCore1);
priv->DefaultInitialGain[3] = read_nic_byte(dev, rOFDM0_XDAGCCore1); priv->DefaultInitialGain[3] = read_nic_byte(dev, rOFDM0_XDAGCCore1);
RT_TRACE(COMP_INIT, "Default initial gain (c50=0x%x, c58=0x%x, " RT_TRACE(COMP_INIT,
"c60=0x%x, c68=0x%x)\n", "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n",
priv->DefaultInitialGain[0], priv->DefaultInitialGain[1], priv->DefaultInitialGain[0], priv->DefaultInitialGain[1],
priv->DefaultInitialGain[2], priv->DefaultInitialGain[3]); priv->DefaultInitialGain[2], priv->DefaultInitialGain[3]);
...@@ -807,8 +809,8 @@ static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel) ...@@ -807,8 +809,8 @@ static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel)
case RF_8258: case RF_8258:
break; break;
default: default:
RT_TRACE(COMP_ERR, "unknown rf chip ID in rtl8192_SetTxPower" RT_TRACE(COMP_ERR,
"Level()\n"); "unknown rf chip ID in rtl8192_SetTxPowerLevel()\n");
break; break;
} }
return; return;
...@@ -822,15 +824,14 @@ static u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable, ...@@ -822,15 +824,14 @@ static u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable,
struct sw_chnl_cmd *pCmd; struct sw_chnl_cmd *pCmd;
if (CmdTable == NULL) { if (CmdTable == NULL) {
RT_TRACE(COMP_ERR, "phy_SetSwChnlCmdArray(): CmdTable cannot " RT_TRACE(COMP_ERR,
"be NULL.\n"); "phy_SetSwChnlCmdArray(): CmdTable cannot be NULL.\n");
return false; return false;
} }
if (CmdTableIdx >= CmdTableSz) { if (CmdTableIdx >= CmdTableSz) {
RT_TRACE(COMP_ERR, "phy_SetSwChnlCmdArray(): Access invalid" RT_TRACE(COMP_ERR,
" index, please check size of the table, CmdTableIdx:" "phy_SetSwChnlCmdArray(): Access invalid index, please check size of the table, CmdTableIdx:%d, CmdTableSz:%d\n",
"%d, CmdTableSz:%d\n", CmdTableIdx, CmdTableSz);
CmdTableIdx, CmdTableSz);
return false; return false;
} }
...@@ -883,8 +884,9 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, ...@@ -883,8 +884,9 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
switch (priv->rf_chip) { switch (priv->rf_chip) {
case RF_8225: case RF_8225:
if (!(channel >= 1 && channel <= 14)) { if (!(channel >= 1 && channel <= 14)) {
RT_TRACE(COMP_ERR, "illegal channel for Zebra " RT_TRACE(COMP_ERR,
"8225: %d\n", channel); "illegal channel for Zebra 8225: %d\n",
channel);
return false; return false;
} }
rtl8192_phy_SetSwChnlCmdArray(ieee->RfDependCmd, rtl8192_phy_SetSwChnlCmdArray(ieee->RfDependCmd,
...@@ -898,8 +900,9 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, ...@@ -898,8 +900,9 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
case RF_8256: case RF_8256:
if (!(channel >= 1 && channel <= 14)) { if (!(channel >= 1 && channel <= 14)) {
RT_TRACE(COMP_ERR, "illegal channel for Zebra" RT_TRACE(COMP_ERR,
" 8256: %d\n", channel); "illegal channel for Zebra 8256: %d\n",
channel);
return false; return false;
} }
rtl8192_phy_SetSwChnlCmdArray(ieee->RfDependCmd, rtl8192_phy_SetSwChnlCmdArray(ieee->RfDependCmd,
...@@ -1082,8 +1085,8 @@ static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct net_device *dev) ...@@ -1082,8 +1085,8 @@ static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct net_device *dev)
if (priv->CCKPresentAttentuation < 0) if (priv->CCKPresentAttentuation < 0)
priv->CCKPresentAttentuation = 0; priv->CCKPresentAttentuation = 0;
RT_TRACE(COMP_POWER_TRACKING, "20M, priv->CCKPresent" RT_TRACE(COMP_POWER_TRACKING,
"Attentuation = %d\n", "20M, priv->CCKPresentAttentuation = %d\n",
priv->CCKPresentAttentuation); priv->CCKPresentAttentuation);
if (priv->rtllib->current_network.channel == 14 && if (priv->rtllib->current_network.channel == 14 &&
...@@ -1104,8 +1107,8 @@ static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct net_device *dev) ...@@ -1104,8 +1107,8 @@ static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct net_device *dev)
priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_40Mdefault +
priv->CCKPresentAttentuation_difference; priv->CCKPresentAttentuation_difference;
RT_TRACE(COMP_POWER_TRACKING, "40M, priv->CCKPresent" RT_TRACE(COMP_POWER_TRACKING,
"Attentuation = %d\n", "40M, priv->CCKPresentAttentuation = %d\n",
priv->CCKPresentAttentuation); priv->CCKPresentAttentuation);
if (priv->CCKPresentAttentuation > if (priv->CCKPresentAttentuation >
(CCKTxBBGainTableLength - 1)) (CCKTxBBGainTableLength - 1))
...@@ -1145,15 +1148,15 @@ static void CCK_Tx_Power_Track_BW_Switch_ThermalMeter(struct net_device *dev) ...@@ -1145,15 +1148,15 @@ static void CCK_Tx_Power_Track_BW_Switch_ThermalMeter(struct net_device *dev)
if (priv->Record_CCK_20Mindex == 0) if (priv->Record_CCK_20Mindex == 0)
priv->Record_CCK_20Mindex = 6; priv->Record_CCK_20Mindex = 6;
priv->CCK_index = priv->Record_CCK_20Mindex; priv->CCK_index = priv->Record_CCK_20Mindex;
RT_TRACE(COMP_POWER_TRACKING, "20MHz, CCK_Tx_Power_Track_BW_" RT_TRACE(COMP_POWER_TRACKING,
"Switch_ThermalMeter(),CCK_index = %d\n", "20MHz, CCK_Tx_Power_Track_BW_Switch_ThermalMeter(),CCK_index = %d\n",
priv->CCK_index); priv->CCK_index);
break; break;
case HT_CHANNEL_WIDTH_20_40: case HT_CHANNEL_WIDTH_20_40:
priv->CCK_index = priv->Record_CCK_40Mindex; priv->CCK_index = priv->Record_CCK_40Mindex;
RT_TRACE(COMP_POWER_TRACKING, "40MHz, CCK_Tx_Power_Track_BW_" RT_TRACE(COMP_POWER_TRACKING,
"Switch_ThermalMeter(), CCK_index = %d\n", "40MHz, CCK_Tx_Power_Track_BW_Switch_ThermalMeter(), CCK_index = %d\n",
priv->CCK_index); priv->CCK_index);
break; break;
} }
...@@ -1176,9 +1179,10 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) ...@@ -1176,9 +1179,10 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 regBwOpMode; u8 regBwOpMode;
RT_TRACE(COMP_SWBW, "==>rtl8192_SetBWModeWorkItem() Switch to %s " RT_TRACE(COMP_SWBW,
"bandwidth\n", priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 ? "==>rtl8192_SetBWModeWorkItem() Switch to %s bandwidth\n",
"20MHz" : "40MHz"); priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 ?
"20MHz" : "40MHz");
if (priv->rf_chip == RF_PSEUDO_11N) { if (priv->rf_chip == RF_PSEUDO_11N) {
...@@ -1203,8 +1207,9 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) ...@@ -1203,8 +1207,9 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
break; break;
default: default:
RT_TRACE(COMP_ERR, "SetChannelBandwidth819xUsb(): unknown " RT_TRACE(COMP_ERR,
"Bandwidth: %#X\n", priv->CurrentChannelBW); "SetChannelBandwidth819xUsb(): unknown Bandwidth: %#X\n",
priv->CurrentChannelBW);
break; break;
} }
...@@ -1244,8 +1249,9 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) ...@@ -1244,8 +1249,9 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
rtl8192_setBBreg(dev, rFPGA0_AnalogParameter1, 0x00100000, 0); rtl8192_setBBreg(dev, rFPGA0_AnalogParameter1, 0x00100000, 0);
break; break;
default: default:
RT_TRACE(COMP_ERR, "SetChannelBandwidth819xUsb(): unknown " RT_TRACE(COMP_ERR,
"Bandwidth: %#X\n", priv->CurrentChannelBW); "SetChannelBandwidth819xUsb(): unknown Bandwidth: %#X\n",
priv->CurrentChannelBW);
break; break;
} }
...@@ -1311,8 +1317,8 @@ void InitialGain819xPci(struct net_device *dev, u8 Operation) ...@@ -1311,8 +1317,8 @@ void InitialGain819xPci(struct net_device *dev, u8 Operation)
if (priv->up) { if (priv->up) {
switch (Operation) { switch (Operation) {
case IG_Backup: case IG_Backup:
RT_TRACE(COMP_SCAN, "IG_Backup, backup the initial" RT_TRACE(COMP_SCAN,
" gain.\n"); "IG_Backup, backup the initial gain.\n");
initial_gain = SCAN_RX_INITIAL_GAIN; initial_gain = SCAN_RX_INITIAL_GAIN;
BitMask = bMaskByte0; BitMask = bMaskByte0;
if (dm_digtable.dig_algorithm == if (dm_digtable.dig_algorithm ==
...@@ -1334,16 +1340,21 @@ void InitialGain819xPci(struct net_device *dev, u8 Operation) ...@@ -1334,16 +1340,21 @@ void InitialGain819xPci(struct net_device *dev, u8 Operation)
priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev,
rCCK0_CCA, BitMask); rCCK0_CCA, BitMask);
RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc50 is" RT_TRACE(COMP_SCAN,
" %x\n", priv->initgain_backup.xaagccore1); "Scan InitialGainBackup 0xc50 is %x\n",
RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc58 is" priv->initgain_backup.xaagccore1);
" %x\n", priv->initgain_backup.xbagccore1); RT_TRACE(COMP_SCAN,
RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc60 is" "Scan InitialGainBackup 0xc58 is %x\n",
" %x\n", priv->initgain_backup.xcagccore1); priv->initgain_backup.xbagccore1);
RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc68 is" RT_TRACE(COMP_SCAN,
" %x\n", priv->initgain_backup.xdagccore1); "Scan InitialGainBackup 0xc60 is %x\n",
RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xa0a is" priv->initgain_backup.xcagccore1);
" %x\n", priv->initgain_backup.cca); RT_TRACE(COMP_SCAN,
"Scan InitialGainBackup 0xc68 is %x\n",
priv->initgain_backup.xdagccore1);
RT_TRACE(COMP_SCAN,
"Scan InitialGainBackup 0xa0a is %x\n",
priv->initgain_backup.cca);
RT_TRACE(COMP_SCAN, "Write scan initial gain = 0x%x\n", RT_TRACE(COMP_SCAN, "Write scan initial gain = 0x%x\n",
initial_gain); initial_gain);
...@@ -1356,8 +1367,8 @@ void InitialGain819xPci(struct net_device *dev, u8 Operation) ...@@ -1356,8 +1367,8 @@ void InitialGain819xPci(struct net_device *dev, u8 Operation)
write_nic_byte(dev, 0xa0a, POWER_DETECTION_TH); write_nic_byte(dev, 0xa0a, POWER_DETECTION_TH);
break; break;
case IG_Restore: case IG_Restore:
RT_TRACE(COMP_SCAN, "IG_Restore, restore the initial " RT_TRACE(COMP_SCAN,
"gain.\n"); "IG_Restore, restore the initial gain.\n");
BitMask = 0x7f; BitMask = 0x7f;
if (dm_digtable.dig_algorithm == if (dm_digtable.dig_algorithm ==
DIG_ALGO_BY_FALSE_ALARM) DIG_ALGO_BY_FALSE_ALARM)
...@@ -1375,16 +1386,21 @@ void InitialGain819xPci(struct net_device *dev, u8 Operation) ...@@ -1375,16 +1386,21 @@ void InitialGain819xPci(struct net_device *dev, u8 Operation)
rtl8192_setBBreg(dev, rCCK0_CCA, BitMask, rtl8192_setBBreg(dev, rCCK0_CCA, BitMask,
(u32)priv->initgain_backup.cca); (u32)priv->initgain_backup.cca);
RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc50" RT_TRACE(COMP_SCAN,
" is %x\n", priv->initgain_backup.xaagccore1); "Scan BBInitialGainRestore 0xc50 is %x\n",
RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc58" priv->initgain_backup.xaagccore1);
" is %x\n", priv->initgain_backup.xbagccore1); RT_TRACE(COMP_SCAN,
RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc60" "Scan BBInitialGainRestore 0xc58 is %x\n",
" is %x\n", priv->initgain_backup.xcagccore1); priv->initgain_backup.xbagccore1);
RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc68" RT_TRACE(COMP_SCAN,
" is %x\n", priv->initgain_backup.xdagccore1); "Scan BBInitialGainRestore 0xc60 is %x\n",
RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xa0a" priv->initgain_backup.xcagccore1);
" is %x\n", priv->initgain_backup.cca); RT_TRACE(COMP_SCAN,
"Scan BBInitialGainRestore 0xc68 is %x\n",
priv->initgain_backup.xdagccore1);
RT_TRACE(COMP_SCAN,
"Scan BBInitialGainRestore 0xa0a is %x\n",
priv->initgain_backup.cca);
rtl8192_phy_setTxPower(dev, rtl8192_phy_setTxPower(dev,
priv->rtllib->current_network.channel); priv->rtllib->current_network.channel);
...@@ -1446,8 +1462,8 @@ static bool SetRFPowerState8190(struct net_device *dev, ...@@ -1446,8 +1462,8 @@ static bool SetRFPowerState8190(struct net_device *dev,
} while (!rtstatus && (InitilizeCount > 0)); } while (!rtstatus && (InitilizeCount > 0));
if (!rtstatus) { if (!rtstatus) {
RT_TRACE(COMP_ERR, "%s():Initialize Ada" RT_TRACE(COMP_ERR,
"pter fail,return\n", "%s():Initialize Adapter fail,return\n",
__func__); __func__);
priv->SetRFPowerStateInProgress = false; priv->SetRFPowerStateInProgress = false;
return false; return false;
...@@ -1491,19 +1507,16 @@ static bool SetRFPowerState8190(struct net_device *dev, ...@@ -1491,19 +1507,16 @@ static bool SetRFPowerState8190(struct net_device *dev,
QueueID++; QueueID++;
continue; continue;
} else { } else {
RT_TRACE((COMP_POWER|COMP_RF), "eRf Off" RT_TRACE((COMP_POWER|COMP_RF),
"/Sleep: %d times TcbBusyQueue" "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=0 before doze!\n",
"[%d] !=0 before doze!\n",
(i+1), QueueID); (i+1), QueueID);
udelay(10); udelay(10);
i++; i++;
} }
if (i >= MAX_DOZE_WAITING_TIMES_9x) { if (i >= MAX_DOZE_WAITING_TIMES_9x) {
RT_TRACE(COMP_POWER, "\n\n\n TimeOut!! " RT_TRACE(COMP_POWER,
"SetRFPowerState8190(): eRfOff" "\n\n\n TimeOut!! SetRFPowerState8190(): eRfOff: %d times TcbBusyQueue[%d] != 0 !!!\n",
": %d times TcbBusyQueue[%d] "
"!= 0 !!!\n",
MAX_DOZE_WAITING_TIMES_9x, MAX_DOZE_WAITING_TIMES_9x,
QueueID); QueueID);
break; break;
...@@ -1513,8 +1526,8 @@ static bool SetRFPowerState8190(struct net_device *dev, ...@@ -1513,8 +1526,8 @@ static bool SetRFPowerState8190(struct net_device *dev,
break; break;
case eRfOff: case eRfOff:
RT_TRACE(COMP_PS, "SetRFPowerState8190() eRfOff/" RT_TRACE(COMP_PS,
"Sleep !\n"); "SetRFPowerState8190() eRfOff/Sleep !\n");
for (QueueID = 0, i = 0; QueueID < MAX_TX_QUEUE; ) { for (QueueID = 0, i = 0; QueueID < MAX_TX_QUEUE; ) {
ring = &priv->tx_ring[QueueID]; ring = &priv->tx_ring[QueueID];
...@@ -1523,19 +1536,16 @@ static bool SetRFPowerState8190(struct net_device *dev, ...@@ -1523,19 +1536,16 @@ static bool SetRFPowerState8190(struct net_device *dev,
QueueID++; QueueID++;
continue; continue;
} else { } else {
RT_TRACE(COMP_POWER, "eRf Off/Sleep: %d" RT_TRACE(COMP_POWER,
" times TcbBusyQueue[%d] !=0 b" "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=0 before doze!\n",
"efore doze!\n", (i+1), (i+1), QueueID);
QueueID);
udelay(10); udelay(10);
i++; i++;
} }
if (i >= MAX_DOZE_WAITING_TIMES_9x) { if (i >= MAX_DOZE_WAITING_TIMES_9x) {
RT_TRACE(COMP_POWER, "\n\n\n SetZebra: " RT_TRACE(COMP_POWER,
"RFPowerState8185B(): eRfOff:" "\n\n\n SetZebra: RFPowerState8185B(): eRfOff: %d times TcbBusyQueue[%d] != 0 !!!\n",
" %d times TcbBusyQueue[%d] "
"!= 0 !!!\n",
MAX_DOZE_WAITING_TIMES_9x, MAX_DOZE_WAITING_TIMES_9x,
QueueID); QueueID);
break; break;
...@@ -1555,8 +1565,9 @@ static bool SetRFPowerState8190(struct net_device *dev, ...@@ -1555,8 +1565,9 @@ static bool SetRFPowerState8190(struct net_device *dev,
default: default:
bResult = false; bResult = false;
RT_TRACE(COMP_ERR, "SetRFPowerState8190(): unknown state" RT_TRACE(COMP_ERR,
" to set: 0x%X!!!\n", eRFPowerState); "SetRFPowerState8190(): unknown state to set: 0x%X!!!\n",
eRFPowerState);
break; break;
} }
...@@ -1575,8 +1586,8 @@ static bool SetRFPowerState8190(struct net_device *dev, ...@@ -1575,8 +1586,8 @@ static bool SetRFPowerState8190(struct net_device *dev,
break; break;
default: default:
RT_TRACE(COMP_ERR, "SetRFPowerState8190(): Unknown " RT_TRACE(COMP_ERR,
"RF type\n"); "SetRFPowerState8190(): Unknown RF type\n");
break; break;
} }
} }
...@@ -1598,8 +1609,8 @@ bool SetRFPowerState(struct net_device *dev, ...@@ -1598,8 +1609,8 @@ bool SetRFPowerState(struct net_device *dev,
eRFPowerState); eRFPowerState);
if (eRFPowerState == priv->rtllib->eRFPowerState && if (eRFPowerState == priv->rtllib->eRFPowerState &&
priv->bHwRfOffAction == 0) { priv->bHwRfOffAction == 0) {
RT_TRACE(COMP_PS, "<--------- SetRFPowerState(): discard the " RT_TRACE(COMP_PS,
"request for eRFPowerState(%d) is the same.\n", "<--------- SetRFPowerState(): discard the request for eRFPowerState(%d) is the same.\n",
eRFPowerState); eRFPowerState);
return bResult; return bResult;
} }
......
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
View file @ 0822339b
...@@ -86,9 +86,9 @@ void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, ...@@ -86,9 +86,9 @@ void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device *ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
RT_TRACE(COMP_DBG, "===========>%s():EntryNo is %d,KeyIndex is " RT_TRACE(COMP_DBG,
"%d,KeyType is %d,is_mesh is %d\n", __func__, EntryNo, "===========>%s():EntryNo is %d,KeyIndex is %d,KeyType is %d,is_mesh is %d\n",
KeyIndex, KeyType, is_mesh); __func__, EntryNo, KeyIndex, KeyType, is_mesh);
if (!is_mesh) { if (!is_mesh) {
ieee->swcamtable[EntryNo].bused = true; ieee->swcamtable[EntryNo].bused = true;
ieee->swcamtable[EntryNo].key_index = KeyIndex; ieee->swcamtable[EntryNo].key_index = KeyIndex;
...@@ -127,9 +127,9 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, ...@@ -127,9 +127,9 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
if (EntryNo >= TOTAL_CAM_ENTRY) if (EntryNo >= TOTAL_CAM_ENTRY)
RT_TRACE(COMP_ERR, "cam entry exceeds in setKey()\n"); RT_TRACE(COMP_ERR, "cam entry exceeds in setKey()\n");
RT_TRACE(COMP_SEC, "====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d," RT_TRACE(COMP_SEC,
"KeyType:%d, MacAddr %pM\n", dev, EntryNo, KeyIndex, "====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d,KeyType:%d, MacAddr %pM\n",
KeyType, MacAddr); dev, EntryNo, KeyIndex, KeyType, MacAddr);
if (DefaultKey) if (DefaultKey)
usConfig |= BIT15 | (KeyType<<2); usConfig |= BIT15 | (KeyType<<2);
...@@ -244,8 +244,8 @@ void CamRestoreAllEntry(struct net_device *dev) ...@@ -244,8 +244,8 @@ void CamRestoreAllEntry(struct net_device *dev)
(u32 *)(&priv->rtllib->swcamtable[0].key_buf[0]) (u32 *)(&priv->rtllib->swcamtable[0].key_buf[0])
); );
} else { } else {
RT_TRACE(COMP_ERR, "===>%s():ERR!! ADHOC TKIP " RT_TRACE(COMP_ERR,
",but 0 entry is have no data\n", "===>%s():ERR!! ADHOC TKIP ,but 0 entry is have no data\n",
__func__); __func__);
return; return;
} }
...@@ -268,8 +268,8 @@ void CamRestoreAllEntry(struct net_device *dev) ...@@ -268,8 +268,8 @@ void CamRestoreAllEntry(struct net_device *dev)
CAM_CONST_ADDR[0], 0, CAM_CONST_ADDR[0], 0,
(u32 *)(&priv->rtllib->swcamtable[0].key_buf[0])); (u32 *)(&priv->rtllib->swcamtable[0].key_buf[0]));
} else { } else {
RT_TRACE(COMP_ERR, "===>%s():ERR!! ADHOC CCMP ," RT_TRACE(COMP_ERR,
"but 0 entry is have no data\n", "===>%s():ERR!! ADHOC CCMP ,but 0 entry is have no data\n",
__func__); __func__);
return; return;
} }
......
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
View file @ 0822339b
...@@ -326,8 +326,8 @@ bool MgntActSet_RF_State(struct net_device *dev, ...@@ -326,8 +326,8 @@ bool MgntActSet_RF_State(struct net_device *dev,
u16 RFWaitCounter = 0; u16 RFWaitCounter = 0;
unsigned long flag; unsigned long flag;
RT_TRACE((COMP_PS | COMP_RF), "===>MgntActSet_RF_State(): " RT_TRACE((COMP_PS | COMP_RF),
"StateToSet(%d)\n", StateToSet); "===>MgntActSet_RF_State(): StateToSet(%d)\n", StateToSet);
ProtectOrNot = false; ProtectOrNot = false;
...@@ -338,22 +338,19 @@ bool MgntActSet_RF_State(struct net_device *dev, ...@@ -338,22 +338,19 @@ bool MgntActSet_RF_State(struct net_device *dev,
if (priv->RFChangeInProgress) { if (priv->RFChangeInProgress) {
spin_unlock_irqrestore(&priv->rf_ps_lock, flag); spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
RT_TRACE((COMP_PS | COMP_RF), RT_TRACE((COMP_PS | COMP_RF),
"MgntActSet_RF_State(): RF Change in " "MgntActSet_RF_State(): RF Change in progress! Wait to set..StateToSet(%d).\n",
"progress! Wait to set..StateToSet" StateToSet);
"(%d).\n", StateToSet);
while (priv->RFChangeInProgress) { while (priv->RFChangeInProgress) {
RFWaitCounter++; RFWaitCounter++;
RT_TRACE((COMP_PS | COMP_RF), RT_TRACE((COMP_PS | COMP_RF),
"MgntActSet_RF_State(): Wait 1" "MgntActSet_RF_State(): Wait 1 ms (%d times)...\n",
" ms (%d times)...\n",
RFWaitCounter); RFWaitCounter);
mdelay(1); mdelay(1);
if (RFWaitCounter > 100) { if (RFWaitCounter > 100) {
RT_TRACE(COMP_ERR, "MgntActSet_" RT_TRACE(COMP_ERR,
"RF_State(): Wait too " "MgntActSet_RF_State(): Wait too logn to set RF\n");
"logn to set RF\n");
return false; return false;
} }
} }
...@@ -383,9 +380,8 @@ bool MgntActSet_RF_State(struct net_device *dev, ...@@ -383,9 +380,8 @@ bool MgntActSet_RF_State(struct net_device *dev,
ChangeSource >= RF_CHANGE_BY_HW) ChangeSource >= RF_CHANGE_BY_HW)
bConnectBySSID = true; bConnectBySSID = true;
} else { } else {
RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State - " RT_TRACE((COMP_PS | COMP_RF),
"eRfon reject pMgntInfo->RfOffReason= 0x%x," "MgntActSet_RF_State - eRfon reject pMgntInfo->RfOffReason= 0x%x, ChangeSource=0x%X\n",
" ChangeSource=0x%X\n",
priv->rtllib->RfOffReason, ChangeSource); priv->rtllib->RfOffReason, ChangeSource);
} }
...@@ -421,8 +417,8 @@ bool MgntActSet_RF_State(struct net_device *dev, ...@@ -421,8 +417,8 @@ bool MgntActSet_RF_State(struct net_device *dev,
} }
if (bActionAllowed) { if (bActionAllowed) {
RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): Action is" RT_TRACE((COMP_PS | COMP_RF),
" allowed.... StateToSet(%d), RfOffReason(%#X)\n", "MgntActSet_RF_State(): Action is allowed.... StateToSet(%d), RfOffReason(%#X)\n",
StateToSet, priv->rtllib->RfOffReason); StateToSet, priv->rtllib->RfOffReason);
PHY_SetRFPowerState(dev, StateToSet); PHY_SetRFPowerState(dev, StateToSet);
if (StateToSet == eRfOn) { if (StateToSet == eRfOn) {
...@@ -434,10 +430,9 @@ bool MgntActSet_RF_State(struct net_device *dev, ...@@ -434,10 +430,9 @@ bool MgntActSet_RF_State(struct net_device *dev,
} }
} }
} else { } else {
RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): " RT_TRACE((COMP_PS | COMP_RF),
"Action is rejected.... StateToSet(%d), ChangeSource" "MgntActSet_RF_State(): Action is rejected.... StateToSet(%d), ChangeSource(%#X), RfOffReason(%#X)\n",
"(%#X), RfOffReason(%#X)\n", StateToSet, ChangeSource, StateToSet, ChangeSource, priv->rtllib->RfOffReason);
priv->rtllib->RfOffReason);
} }
if (!ProtectOrNot) { if (!ProtectOrNot) {
...@@ -460,9 +455,9 @@ static short rtl8192_get_nic_desc_num(struct net_device *dev, int prio) ...@@ -460,9 +455,9 @@ static short rtl8192_get_nic_desc_num(struct net_device *dev, int prio)
* between the tail and the head * between the tail and the head
*/ */
if ((prio == MGNT_QUEUE) && (skb_queue_len(&ring->queue) > 10)) if ((prio == MGNT_QUEUE) && (skb_queue_len(&ring->queue) > 10))
RT_TRACE(COMP_DBG, "-----[%d]---------ring->idx=%d " RT_TRACE(COMP_DBG,
"queue_len=%d---------\n", prio, ring->idx, "-----[%d]---------ring->idx=%d queue_len=%d---------\n",
skb_queue_len(&ring->queue)); prio, ring->idx, skb_queue_len(&ring->queue));
return skb_queue_len(&ring->queue); return skb_queue_len(&ring->queue);
} }
...@@ -526,8 +521,9 @@ void rtl8192_update_cap(struct net_device *dev, u16 cap) ...@@ -526,8 +521,9 @@ void rtl8192_update_cap(struct net_device *dev, u16 cap)
if (priv->dot11CurrentPreambleMode != PREAMBLE_SHORT) { if (priv->dot11CurrentPreambleMode != PREAMBLE_SHORT) {
ShortPreamble = true; ShortPreamble = true;
priv->dot11CurrentPreambleMode = PREAMBLE_SHORT; priv->dot11CurrentPreambleMode = PREAMBLE_SHORT;
RT_TRACE(COMP_DBG, "%s(): WLAN_CAPABILITY_SHORT_" RT_TRACE(COMP_DBG,
"PREAMBLE\n", __func__); "%s(): WLAN_CAPABILITY_SHORT_PREAMBLE\n",
__func__);
priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE, priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE,
(unsigned char *)&ShortPreamble); (unsigned char *)&ShortPreamble);
} }
...@@ -535,8 +531,9 @@ void rtl8192_update_cap(struct net_device *dev, u16 cap) ...@@ -535,8 +531,9 @@ void rtl8192_update_cap(struct net_device *dev, u16 cap)
if (priv->dot11CurrentPreambleMode != PREAMBLE_LONG) { if (priv->dot11CurrentPreambleMode != PREAMBLE_LONG) {
ShortPreamble = false; ShortPreamble = false;
priv->dot11CurrentPreambleMode = PREAMBLE_LONG; priv->dot11CurrentPreambleMode = PREAMBLE_LONG;
RT_TRACE(COMP_DBG, "%s(): WLAN_CAPABILITY_LONG_" RT_TRACE(COMP_DBG,
"PREAMBLE\n", __func__); "%s(): WLAN_CAPABILITY_LONG_PREAMBLE\n",
__func__);
priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE, priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE,
(unsigned char *)&ShortPreamble); (unsigned char *)&ShortPreamble);
} }
...@@ -597,8 +594,8 @@ static void rtl8192_qos_activate(void *data) ...@@ -597,8 +594,8 @@ static void rtl8192_qos_activate(void *data)
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
if (priv->rtllib->state != RTLLIB_LINKED) if (priv->rtllib->state != RTLLIB_LINKED)
goto success; goto success;
RT_TRACE(COMP_QOS, "qos active process with associate response " RT_TRACE(COMP_QOS,
"received\n"); "qos active process with associate response received\n");
for (i = 0; i < QOS_QUEUE_NUM; i++) for (i = 0; i < QOS_QUEUE_NUM; i++)
priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8 *)(&i)); priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8 *)(&i));
...@@ -634,8 +631,8 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, ...@@ -634,8 +631,8 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
network->qos_data.param_count; network->qos_data.param_count;
priv->rtllib->wmm_acm = network->qos_data.wmm_acm; priv->rtllib->wmm_acm = network->qos_data.wmm_acm;
queue_work_rsl(priv->priv_wq, &priv->qos_activate); queue_work_rsl(priv->priv_wq, &priv->qos_activate);
RT_TRACE(COMP_QOS, "QoS parameters change call " RT_TRACE(COMP_QOS,
"qos_activate\n"); "QoS parameters change call qos_activate\n");
} }
} else { } else {
memcpy(&priv->rtllib->current_network.qos_data.parameters, memcpy(&priv->rtllib->current_network.qos_data.parameters,
...@@ -643,8 +640,8 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, ...@@ -643,8 +640,8 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
if ((network->qos_data.active == 1) && (active_network == 1)) { if ((network->qos_data.active == 1) && (active_network == 1)) {
queue_work_rsl(priv->priv_wq, &priv->qos_activate); queue_work_rsl(priv->priv_wq, &priv->qos_activate);
RT_TRACE(COMP_QOS, "QoS was disabled call qos_" RT_TRACE(COMP_QOS,
"activate\n"); "QoS was disabled call qos_activate\n");
} }
network->qos_data.active = 0; network->qos_data.active = 0;
network->qos_data.supported = 0; network->qos_data.supported = 0;
...@@ -909,8 +906,9 @@ void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode) ...@@ -909,8 +906,9 @@ void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)
} else if ((bSupportMode & WIRELESS_MODE_B)) { } else if ((bSupportMode & WIRELESS_MODE_B)) {
wireless_mode = WIRELESS_MODE_B; wireless_mode = WIRELESS_MODE_B;
} else { } else {
RT_TRACE(COMP_ERR, "%s(), No valid wireless mode " RT_TRACE(COMP_ERR,
"supported (%x)!!!\n", __func__, bSupportMode); "%s(), No valid wireless mode supported (%x)!!!\n",
__func__, bSupportMode);
wireless_mode = WIRELESS_MODE_B; wireless_mode = WIRELESS_MODE_B;
} }
} }
...@@ -1025,8 +1023,9 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) ...@@ -1025,8 +1023,9 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
spin_lock_irqsave(&priv->rf_ps_lock, flags); spin_lock_irqsave(&priv->rf_ps_lock, flags);
break; break;
} }
RT_TRACE(COMP_DBG, "===>%s():RF is in progress, need to wait " RT_TRACE(COMP_DBG,
"until rf change is done.\n", __func__); "===>%s():RF is in progress, need to wait until rf change is done.\n",
__func__);
mdelay(1); mdelay(1);
RFInProgressTimeOut++; RFInProgressTimeOut++;
spin_lock_irqsave(&priv->rf_ps_lock, flags); spin_lock_irqsave(&priv->rf_ps_lock, flags);
...@@ -1212,8 +1211,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev) ...@@ -1212,8 +1211,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
priv->AcmControl = 0; priv->AcmControl = 0;
priv->pFirmware = vzalloc(sizeof(struct rt_firmware)); priv->pFirmware = vzalloc(sizeof(struct rt_firmware));
if (!priv->pFirmware) if (!priv->pFirmware)
printk(KERN_ERR "rtl8192e: Unable to allocate space " printk(KERN_ERR
"for firmware\n"); "rtl8192e: Unable to allocate space for firmware\n");
skb_queue_head_init(&priv->rx_queue); skb_queue_head_init(&priv->rx_queue);
skb_queue_head_init(&priv->skb_queue); skb_queue_head_init(&priv->skb_queue);
...@@ -1278,14 +1277,15 @@ static short rtl8192_get_channel_map(struct net_device *dev) ...@@ -1278,14 +1277,15 @@ static short rtl8192_get_channel_map(struct net_device *dev)
if ((priv->rf_chip != RF_8225) && (priv->rf_chip != RF_8256) if ((priv->rf_chip != RF_8225) && (priv->rf_chip != RF_8256)
&& (priv->rf_chip != RF_6052)) { && (priv->rf_chip != RF_6052)) {
RT_TRACE(COMP_ERR, "%s: unknown rf chip, can't set channel " RT_TRACE(COMP_ERR,
"map\n", __func__); "%s: unknown rf chip, can't set channel map\n",
__func__);
return -1; return -1;
} }
if (priv->ChannelPlan >= COUNTRY_CODE_MAX) { if (priv->ChannelPlan >= COUNTRY_CODE_MAX) {
printk(KERN_INFO "rtl819x_init:Error channel plan! Set to " printk(KERN_INFO
"default.\n"); "rtl819x_init:Error channel plan! Set to default.\n");
priv->ChannelPlan = COUNTRY_CODE_FCC; priv->ChannelPlan = COUNTRY_CODE_FCC;
} }
RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan); RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan);
...@@ -1406,8 +1406,9 @@ static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev) ...@@ -1406,8 +1406,9 @@ static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev)
tcb_desc->nStuckCount++; tcb_desc->nStuckCount++;
bCheckFwTxCnt = true; bCheckFwTxCnt = true;
if (tcb_desc->nStuckCount > 1) if (tcb_desc->nStuckCount > 1)
printk(KERN_INFO "%s: QueueID=%d tcb_desc->n" printk(KERN_INFO
"StuckCount=%d\n", __func__, QueueID, "%s: QueueID=%d tcb_desc->nStuckCount=%d\n",
__func__, QueueID,
tcb_desc->nStuckCount); tcb_desc->nStuckCount);
} }
} }
...@@ -1415,8 +1416,8 @@ static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev) ...@@ -1415,8 +1416,8 @@ static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev)
if (bCheckFwTxCnt) { if (bCheckFwTxCnt) {
if (priv->ops->TxCheckStuckHandler(dev)) { if (priv->ops->TxCheckStuckHandler(dev)) {
RT_TRACE(COMP_RESET, "TxCheckStuck(): Fw indicates no" RT_TRACE(COMP_RESET,
" Tx condition!\n"); "TxCheckStuck(): Fw indicates no Tx condition!\n");
return RESET_TYPE_SILENT; return RESET_TYPE_SILENT;
} }
} }
...@@ -1507,8 +1508,9 @@ static void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1507,8 +1508,9 @@ static void rtl819x_ifsilentreset(struct net_device *dev)
LeisurePSLeave(dev); LeisurePSLeave(dev);
if (priv->up) { if (priv->up) {
RT_TRACE(COMP_ERR, "%s():the driver is not up! " RT_TRACE(COMP_ERR,
"return\n", __func__); "%s():the driver is not up! return\n",
__func__);
up(&priv->wx_sem); up(&priv->wx_sem);
return; return;
} }
...@@ -1517,8 +1519,9 @@ static void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1517,8 +1519,9 @@ static void rtl819x_ifsilentreset(struct net_device *dev)
RT_TRACE(COMP_RESET, "%s():======>start to down the driver\n", RT_TRACE(COMP_RESET, "%s():======>start to down the driver\n",
__func__); __func__);
mdelay(1000); mdelay(1000);
RT_TRACE(COMP_RESET, "%s():111111111111111111111111======>start" RT_TRACE(COMP_RESET,
" to down the driver\n", __func__); "%s():111111111111111111111111======>start to down the driver\n",
__func__);
if (!netif_queue_stopped(dev)) if (!netif_queue_stopped(dev))
netif_stop_queue(dev); netif_stop_queue(dev);
...@@ -1546,22 +1549,24 @@ static void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1546,22 +1549,24 @@ static void rtl819x_ifsilentreset(struct net_device *dev)
dm_backup_dynamic_mechanism_state(dev); dm_backup_dynamic_mechanism_state(dev);
up(&priv->wx_sem); up(&priv->wx_sem);
RT_TRACE(COMP_RESET, "%s():<==========down process is " RT_TRACE(COMP_RESET,
"finished\n", __func__); "%s():<==========down process is finished\n",
__func__);
RT_TRACE(COMP_RESET, "%s():<===========up process start\n", RT_TRACE(COMP_RESET, "%s():<===========up process start\n",
__func__); __func__);
reset_status = _rtl8192_up(dev, true); reset_status = _rtl8192_up(dev, true);
RT_TRACE(COMP_RESET, "%s():<===========up process is " RT_TRACE(COMP_RESET,
"finished\n", __func__); "%s():<===========up process is finished\n", __func__);
if (reset_status == -1) { if (reset_status == -1) {
if (reset_times < 3) { if (reset_times < 3) {
reset_times++; reset_times++;
goto RESET_START; goto RESET_START;
} else { } else {
RT_TRACE(COMP_ERR, " ERR!!! %s(): Reset " RT_TRACE(COMP_ERR,
"Failed!!\n", __func__); " ERR!!! %s(): Reset Failed!!\n",
__func__);
} }
} }
...@@ -1670,8 +1675,8 @@ void rtl819x_watchdog_wqcallback(void *data) ...@@ -1670,8 +1675,8 @@ void rtl819x_watchdog_wqcallback(void *data)
if ((ieee->PowerSaveControl.ReturnPoint == if ((ieee->PowerSaveControl.ReturnPoint ==
IPS_CALLBACK_NONE) && IPS_CALLBACK_NONE) &&
(!ieee->bNetPromiscuousMode)) { (!ieee->bNetPromiscuousMode)) {
RT_TRACE(COMP_PS, "====================>haha: " RT_TRACE(COMP_PS,
"IPSEnter()\n"); "====================>haha: IPSEnter()\n");
IPSEnter(dev); IPSEnter(dev);
} }
} }
...@@ -1736,8 +1741,9 @@ void rtl819x_watchdog_wqcallback(void *data) ...@@ -1736,8 +1741,9 @@ void rtl819x_watchdog_wqcallback(void *data)
if (ieee->eRFPowerState == eRfOff) if (ieee->eRFPowerState == eRfOff)
RT_TRACE(COMP_ERR, "========>%s()\n", __func__); RT_TRACE(COMP_ERR, "========>%s()\n", __func__);
printk(KERN_INFO "===>%s(): AP is power off, chan:%d," printk(KERN_INFO
" connect another one\n", __func__, priv->chan); "===>%s(): AP is power off, chan:%d, connect another one\n",
__func__, priv->chan);
ieee->state = RTLLIB_ASSOCIATING; ieee->state = RTLLIB_ASSOCIATING;
...@@ -2007,9 +2013,9 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) ...@@ -2007,9 +2013,9 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
u32 fwinfo_size = 0; u32 fwinfo_size = 0;
if (priv->bdisable_nic) { if (priv->bdisable_nic) {
RT_TRACE(COMP_ERR, "%s: ERR!! Nic is disabled! Can't tx packet" RT_TRACE(COMP_ERR,
" len=%d qidx=%d!!!\n", __func__, skb->len, "%s: ERR!! Nic is disabled! Can't tx packet len=%d qidx=%d!!!\n",
tcb_desc->queue_index); __func__, skb->len, tcb_desc->queue_index);
return skb->len; return skb->len;
} }
...@@ -2046,8 +2052,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) ...@@ -2046,8 +2052,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
pdesc = &ring->desc[idx]; pdesc = &ring->desc[idx];
if ((pdesc->OWN == 1) && (tcb_desc->queue_index != BEACON_QUEUE)) { if ((pdesc->OWN == 1) && (tcb_desc->queue_index != BEACON_QUEUE)) {
RT_TRACE(COMP_ERR, "No more TX desc@%d, ring->idx = %d, idx = " RT_TRACE(COMP_ERR,
"%d, skblen = 0x%x queuelen=%d", "No more TX desc@%d, ring->idx = %d, idx = %d, skblen = 0x%x queuelen=%d",
tcb_desc->queue_index, ring->idx, idx, skb->len, tcb_desc->queue_index, ring->idx, idx, skb->len,
skb_queue_len(&ring->queue)); skb_queue_len(&ring->queue));
spin_unlock_irqrestore(&priv->irq_th_lock, flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
...@@ -2940,8 +2946,8 @@ static int rtl8192_pci_probe(struct pci_dev *pdev, ...@@ -2940,8 +2946,8 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
dev->watchdog_timeo = HZ * 3; dev->watchdog_timeo = HZ * 3;
if (dev_alloc_name(dev, ifname) < 0) { if (dev_alloc_name(dev, ifname) < 0) {
RT_TRACE(COMP_INIT, "Oops: devname already taken! Trying " RT_TRACE(COMP_INIT,
"wlan%%d...\n"); "Oops: devname already taken! Trying wlan%%d...\n");
dev_alloc_name(dev, ifname); dev_alloc_name(dev, ifname);
} }
......
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file @ 0822339b
...@@ -757,8 +757,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) ...@@ -757,8 +757,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
for (i = 0; i < CCK_Table_length; i++) { for (i = 0; i < CCK_Table_length; i++) {
if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) { if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
priv->CCK_index = (u8) i; priv->CCK_index = (u8) i;
RT_TRACE(COMP_POWER_TRACKING, "Initial reg0x%x" RT_TRACE(COMP_POWER_TRACKING,
" = 0x%x, CCK_index = 0x%x\n", "Initial reg0x%x = 0x%x, CCK_index = 0x%x\n",
rCCK0_TxFilter1, TempCCk, rCCK0_TxFilter1, TempCCk,
priv->CCK_index); priv->CCK_index);
break; break;
...@@ -803,8 +803,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) ...@@ -803,8 +803,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
priv->Record_CCK_20Mindex = tmpCCK20Mindex; priv->Record_CCK_20Mindex = tmpCCK20Mindex;
priv->Record_CCK_40Mindex = tmpCCK40Mindex; priv->Record_CCK_40Mindex = tmpCCK40Mindex;
RT_TRACE(COMP_POWER_TRACKING, "Record_CCK_20Mindex / Record_CCK_40" RT_TRACE(COMP_POWER_TRACKING,
"Mindex = %d / %d.\n", "Record_CCK_20Mindex / Record_CCK_40Mindex = %d / %d.\n",
priv->Record_CCK_20Mindex, priv->Record_CCK_40Mindex); priv->Record_CCK_20Mindex, priv->Record_CCK_40Mindex);
if (priv->rtllib->current_network.channel == 14 && if (priv->rtllib->current_network.channel == 14 &&
...@@ -2131,8 +2131,8 @@ static void dm_check_edca_turbo(struct net_device *dev) ...@@ -2131,8 +2131,8 @@ static void dm_check_edca_turbo(struct net_device *dev)
static int wb_tmp; static int wb_tmp;
if (wb_tmp == 0) { if (wb_tmp == 0) {
printk(KERN_INFO "%s():iot peer is %s, bssid:" printk(KERN_INFO
" %pM\n", __func__, "%s():iot peer is %s, bssid: %pM\n", __func__,
peername[pHTInfo->IOTPeer], peername[pHTInfo->IOTPeer],
priv->rtllib->current_network.bssid); priv->rtllib->current_network.bssid);
wb_tmp = 1; wb_tmp = 1;
...@@ -2638,9 +2638,10 @@ void dm_fsync_timer_callback(unsigned long data) ...@@ -2638,9 +2638,10 @@ void dm_fsync_timer_callback(unsigned long data)
} }
priv->rate_record = rate_count; priv->rate_record = rate_count;
priv->rateCountDiffRecord = rate_count_diff; priv->rateCountDiffRecord = rate_count_diff;
RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rate" RT_TRACE(COMP_HALDM,
"Countdiff %d bSwitchFsync %d\n", priv->rate_record, "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n",
rate_count, rate_count_diff, priv->bswitch_fsync); priv->rate_record, rate_count, rate_count_diff,
priv->bswitch_fsync);
if (priv->undecorated_smoothed_pwdb > if (priv->undecorated_smoothed_pwdb >
priv->rtllib->fsync_rssi_threshold && priv->rtllib->fsync_rssi_threshold &&
bSwitchFromCountDiff) { bSwitchFromCountDiff) {
...@@ -2685,9 +2686,10 @@ void dm_fsync_timer_callback(unsigned long data) ...@@ -2685,9 +2686,10 @@ void dm_fsync_timer_callback(unsigned long data)
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);
} }
RT_TRACE(COMP_HALDM, "ContinueDiffCount %d\n", priv->ContinueDiffCount); RT_TRACE(COMP_HALDM, "ContinueDiffCount %d\n", priv->ContinueDiffCount);
RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d " RT_TRACE(COMP_HALDM,
"bSwitchFsync %d\n", priv->rate_record, rate_count, "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n",
rate_count_diff, priv->bswitch_fsync); priv->rate_record, rate_count, rate_count_diff,
priv->bswitch_fsync);
} }
static void dm_StartHWFsync(struct net_device *dev) static void dm_StartHWFsync(struct net_device *dev)
...@@ -2778,12 +2780,14 @@ void dm_check_fsync(struct net_device *dev) ...@@ -2778,12 +2780,14 @@ void dm_check_fsync(struct net_device *dev)
static u8 reg_c38_State = RegC38_Default; static u8 reg_c38_State = RegC38_Default;
static u32 reset_cnt; static u32 reset_cnt;
RT_TRACE(COMP_HALDM, "RSSI %d TimeInterval %d MultipleTimeInterval " RT_TRACE(COMP_HALDM,
"%d\n", priv->rtllib->fsync_rssi_threshold, "RSSI %d TimeInterval %d MultipleTimeInterval %d\n",
priv->rtllib->fsync_rssi_threshold,
priv->rtllib->fsync_time_interval, priv->rtllib->fsync_time_interval,
priv->rtllib->fsync_multiple_timeinterval); priv->rtllib->fsync_multiple_timeinterval);
RT_TRACE(COMP_HALDM, "RateBitmap 0x%x FirstDiffRateThreshold %d Second" RT_TRACE(COMP_HALDM,
"DiffRateThreshold %d\n", priv->rtllib->fsync_rate_bitmap, "RateBitmap 0x%x FirstDiffRateThreshold %d SecondDiffRateThreshold %d\n",
priv->rtllib->fsync_rate_bitmap,
priv->rtllib->fsync_firstdiff_ratethreshold, priv->rtllib->fsync_firstdiff_ratethreshold,
priv->rtllib->fsync_seconddiff_ratethreshold); priv->rtllib->fsync_seconddiff_ratethreshold);
......
drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
View file @ 0822339b
...@@ -65,13 +65,15 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev) ...@@ -65,13 +65,15 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev)
if (DeviceID == 0x8172) { if (DeviceID == 0x8172) {
switch (RevisionID) { switch (RevisionID) {
case HAL_HW_PCI_REVISION_ID_8192PCIE: case HAL_HW_PCI_REVISION_ID_8192PCIE:
printk(KERN_INFO "Adapter(8192 PCI-E) is found - " printk(KERN_INFO
"DeviceID=%x\n", DeviceID); "Adapter(8192 PCI-E) is found - DeviceID=%x\n",
DeviceID);
priv->card_8192 = NIC_8192E; priv->card_8192 = NIC_8192E;
break; break;
case HAL_HW_PCI_REVISION_ID_8192SE: case HAL_HW_PCI_REVISION_ID_8192SE:
printk(KERN_INFO "Adapter(8192SE) is found - " printk(KERN_INFO
"DeviceID=%x\n", DeviceID); "Adapter(8192SE) is found - DeviceID=%x\n",
DeviceID);
priv->card_8192 = NIC_8192SE; priv->card_8192 = NIC_8192SE;
break; break;
default: default:
...@@ -83,9 +85,11 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev) ...@@ -83,9 +85,11 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev)
} }
if (priv->ops->nic_type != priv->card_8192) { if (priv->ops->nic_type != priv->card_8192) {
printk(KERN_INFO "Detect info(%x) and hardware info(%x) not match!\n", printk(KERN_INFO
priv->ops->nic_type, priv->card_8192); "Detect info(%x) and hardware info(%x) not match!\n",
printk(KERN_INFO "Please select proper driver before install!!!!\n"); priv->ops->nic_type, priv->card_8192);
printk(KERN_INFO
"Please select proper driver before install!!!!\n");
return false; return false;
} }
......
drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
View file @ 0822339b
...@@ -35,8 +35,8 @@ int rtl8192E_suspend(struct pci_dev *pdev, pm_message_t state) ...@@ -35,8 +35,8 @@ int rtl8192E_suspend(struct pci_dev *pdev, pm_message_t state)
priv->polling_timer_on = 0; priv->polling_timer_on = 0;
if (!netif_running(dev)) { if (!netif_running(dev)) {
printk(KERN_INFO "RTL819XE:UI is open out of suspend " printk(KERN_INFO
"function\n"); "RTL819XE:UI is open out of suspend function\n");
goto out_pci_suspend; goto out_pci_suspend;
} }
...@@ -59,8 +59,8 @@ int rtl8192E_suspend(struct pci_dev *pdev, pm_message_t state) ...@@ -59,8 +59,8 @@ int rtl8192E_suspend(struct pci_dev *pdev, pm_message_t state)
out_pci_suspend: out_pci_suspend:
printk("r8192E support WOL call??????????????????????\n"); printk("r8192E support WOL call??????????????????????\n");
if (priv->rtllib->bSupportRemoteWakeUp) if (priv->rtllib->bSupportRemoteWakeUp)
RT_TRACE(COMP_POWER, "r8192E support WOL call!!!!!!!" RT_TRACE(COMP_POWER,
"!!!!!!!!!!!.\n"); "r8192E support WOL call!!!!!!!!!!!!!!!!!!.\n");
pci_save_state(pdev); pci_save_state(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_enable_wake(pdev, pci_choose_state(pdev, state), pci_enable_wake(pdev, pci_choose_state(pdev, state),
...@@ -101,8 +101,8 @@ int rtl8192E_resume(struct pci_dev *pdev) ...@@ -101,8 +101,8 @@ int rtl8192E_resume(struct pci_dev *pdev)
check_rfctrl_gpio_timer((unsigned long)dev); check_rfctrl_gpio_timer((unsigned long)dev);
if (!netif_running(dev)) { if (!netif_running(dev)) {
printk(KERN_INFO "RTL819XE:UI is open out of resume " printk(KERN_INFO
"function\n"); "RTL819XE:UI is open out of resume function\n");
goto out; goto out;
} }
......
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
View file @ 0822339b
...@@ -37,8 +37,8 @@ static void rtl8192_hw_sleep_down(struct net_device *dev) ...@@ -37,8 +37,8 @@ static void rtl8192_hw_sleep_down(struct net_device *dev)
spin_lock_irqsave(&priv->rf_ps_lock, flags); spin_lock_irqsave(&priv->rf_ps_lock, flags);
if (priv->RFChangeInProgress) { if (priv->RFChangeInProgress) {
spin_unlock_irqrestore(&priv->rf_ps_lock, flags); spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
RT_TRACE(COMP_DBG, "rtl8192_hw_sleep_down(): RF Change in " RT_TRACE(COMP_DBG,
"progress!\n"); "rtl8192_hw_sleep_down(): RF Change in progress!\n");
return; return;
} }
spin_unlock_irqrestore(&priv->rf_ps_lock, flags); spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
...@@ -64,8 +64,8 @@ void rtl8192_hw_wakeup(struct net_device *dev) ...@@ -64,8 +64,8 @@ void rtl8192_hw_wakeup(struct net_device *dev)
spin_lock_irqsave(&priv->rf_ps_lock, flags); spin_lock_irqsave(&priv->rf_ps_lock, flags);
if (priv->RFChangeInProgress) { if (priv->RFChangeInProgress) {
spin_unlock_irqrestore(&priv->rf_ps_lock, flags); spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
RT_TRACE(COMP_DBG, "rtl8192_hw_wakeup(): RF Change in " RT_TRACE(COMP_DBG,
"progress!\n"); "rtl8192_hw_wakeup(): RF Change in progress!\n");
queue_delayed_work_rsl(priv->rtllib->wq, queue_delayed_work_rsl(priv->rtllib->wq,
&priv->rtllib->hw_wakeup_wq, &priv->rtllib->hw_wakeup_wq,
msecs_to_jiffies(10)); msecs_to_jiffies(10));
...@@ -240,8 +240,8 @@ static bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev, ...@@ -240,8 +240,8 @@ static bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev,
priv->rtllib->sta_sleep = LPS_IS_WAKE; priv->rtllib->sta_sleep = LPS_IS_WAKE;
spin_lock_irqsave(&(priv->rtllib->mgmt_tx_lock), flags); spin_lock_irqsave(&(priv->rtllib->mgmt_tx_lock), flags);
RT_TRACE(COMP_DBG, "LPS leave: notify AP we are awaked" RT_TRACE(COMP_DBG,
" ++++++++++ SendNullFunctionData\n"); "LPS leave: notify AP we are awaked ++++++++++ SendNullFunctionData\n");
rtllib_sta_ps_send_null_frame(priv->rtllib, 0); rtllib_sta_ps_send_null_frame(priv->rtllib, 0);
spin_unlock_irqrestore(&(priv->rtllib->mgmt_tx_lock), flags); spin_unlock_irqrestore(&(priv->rtllib->mgmt_tx_lock), flags);
} }
...@@ -256,8 +256,8 @@ void LeisurePSEnter(struct net_device *dev) ...@@ -256,8 +256,8 @@ void LeisurePSEnter(struct net_device *dev)
&(priv->rtllib->PowerSaveControl); &(priv->rtllib->PowerSaveControl);
RT_TRACE(COMP_PS, "LeisurePSEnter()...\n"); RT_TRACE(COMP_PS, "LeisurePSEnter()...\n");
RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdle" RT_TRACE(COMP_PS,
"Count is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n", "pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdleCount is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n",
pPSC->bLeisurePs, priv->rtllib->ps, pPSC->LpsIdleCount, pPSC->bLeisurePs, priv->rtllib->ps, pPSC->LpsIdleCount,
RT_CHECK_FOR_HANG_PERIOD); RT_CHECK_FOR_HANG_PERIOD);
...@@ -272,8 +272,8 @@ void LeisurePSEnter(struct net_device *dev) ...@@ -272,8 +272,8 @@ void LeisurePSEnter(struct net_device *dev)
if (priv->rtllib->ps == RTLLIB_PS_DISABLED) { if (priv->rtllib->ps == RTLLIB_PS_DISABLED) {
RT_TRACE(COMP_LPS, "LeisurePSEnter(): Enter " RT_TRACE(COMP_LPS,
"802.11 power save mode...\n"); "LeisurePSEnter(): Enter 802.11 power save mode...\n");
if (!pPSC->bFwCtrlLPS) { if (!pPSC->bFwCtrlLPS) {
if (priv->rtllib->SetFwCmdHandler) if (priv->rtllib->SetFwCmdHandler)
...@@ -302,8 +302,8 @@ void LeisurePSLeave(struct net_device *dev) ...@@ -302,8 +302,8 @@ void LeisurePSLeave(struct net_device *dev)
if (pPSC->bLeisurePs) { if (pPSC->bLeisurePs) {
if (priv->rtllib->ps != RTLLIB_PS_DISABLED) { if (priv->rtllib->ps != RTLLIB_PS_DISABLED) {
RT_TRACE(COMP_LPS, "LeisurePSLeave(): Busy Traffic , " RT_TRACE(COMP_LPS,
"Leave 802.11 power save..\n"); "LeisurePSLeave(): Busy Traffic , Leave 802.11 power save..\n");
MgntActSet_802_11_PowerSaveMode(dev, MgntActSet_802_11_PowerSaveMode(dev,
RTLLIB_PS_DISABLED); RTLLIB_PS_DISABLED);
......
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
View file @ 0822339b
...@@ -116,8 +116,9 @@ static int r8192_wx_set_power(struct net_device *dev, ...@@ -116,8 +116,9 @@ static int r8192_wx_set_power(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff) { if (priv->bHwRadioOff) {
RT_TRACE(COMP_ERR, "%s():Hw is Radio Off, we can't set " RT_TRACE(COMP_ERR,
"Power,return\n", __func__); "%s():Hw is Radio Off, we can't set Power,return\n",
__func__);
return 0; return 0;
} }
down(&priv->wx_sem); down(&priv->wx_sem);
...@@ -256,8 +257,9 @@ static int r8192se_wx_set_radio(struct net_device *dev, ...@@ -256,8 +257,9 @@ static int r8192se_wx_set_radio(struct net_device *dev,
printk(KERN_INFO "%s(): set radio ! extra is %d\n", __func__, *extra); printk(KERN_INFO "%s(): set radio ! extra is %d\n", __func__, *extra);
if ((*extra != 0) && (*extra != 1)) { if ((*extra != 0) && (*extra != 1)) {
RT_TRACE(COMP_ERR, "%s(): set radio an err value,must 0(radio " RT_TRACE(COMP_ERR,
"off) or 1(radio on)\n", __func__); "%s(): set radio an err value,must 0(radio off) or 1(radio on)\n",
__func__);
up(&priv->wx_sem); up(&priv->wx_sem);
return -1; return -1;
} }
...@@ -293,8 +295,9 @@ static int r8192se_wx_set_force_lps(struct net_device *dev, ...@@ -293,8 +295,9 @@ static int r8192se_wx_set_force_lps(struct net_device *dev,
down(&priv->wx_sem); down(&priv->wx_sem);
printk(KERN_INFO "%s(): force LPS ! extra is %d (1 is open 0 is " printk(KERN_INFO
"close)\n", __func__, *extra); "%s(): force LPS ! extra is %d (1 is open 0 is close)\n",
__func__, *extra);
priv->force_lps = *extra; priv->force_lps = *extra;
up(&priv->wx_sem); up(&priv->wx_sem);
return 0; return 0;
...@@ -344,8 +347,9 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a, ...@@ -344,8 +347,9 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
up(&priv->wx_sem); up(&priv->wx_sem);
return -1; return -1;
} else { } else {
printk(KERN_INFO "=========>%s(): " printk(KERN_INFO
"IPSLeave\n", __func__); "=========>%s(): IPSLeave\n",
__func__);
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); IPSLeave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
...@@ -500,13 +504,15 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a, ...@@ -500,13 +504,15 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
if (rtState == eRfOff) { if (rtState == eRfOff) {
if (priv->rtllib->RfOffReason > if (priv->rtllib->RfOffReason >
RF_CHANGE_BY_IPS) { RF_CHANGE_BY_IPS) {
RT_TRACE(COMP_ERR, "%s(): RF is " RT_TRACE(COMP_ERR,
"OFF.\n", __func__); "%s(): RF is OFF.\n",
__func__);
up(&priv->wx_sem); up(&priv->wx_sem);
return -1; return -1;
} else { } else {
RT_TRACE(COMP_PS, "=========>%s(): " RT_TRACE(COMP_PS,
"IPSLeave\n", __func__); "=========>%s(): IPSLeave\n",
__func__);
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); IPSLeave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
...@@ -573,8 +579,9 @@ static int r8192_wx_set_essid(struct net_device *dev, ...@@ -573,8 +579,9 @@ static int r8192_wx_set_essid(struct net_device *dev,
int ret; int ret;
if (priv->bHwRadioOff) { if (priv->bHwRadioOff) {
printk(KERN_INFO "=========>%s():hw radio off,or Rf state is " printk(KERN_INFO
"eRfOff, return\n", __func__); "=========>%s():hw radio off,or Rf state is eRfOff, return\n",
__func__);
return 0; return 0;
} }
down(&priv->wx_sem); down(&priv->wx_sem);
......
drivers/staging/rtl8192e/rtl819x_BAProc.c
View file @ 0822339b
...@@ -83,9 +83,9 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, ...@@ -83,9 +83,9 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,
u8 *tag = NULL; u8 *tag = NULL;
u16 len = ieee->tx_headroom + 9; u16 len = ieee->tx_headroom + 9;
RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, "========>%s(), frame(%d)" RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA,
" sentd to: %pM, ieee->dev:%p\n", __func__, "========>%s(), frame(%d) sentd to: %pM, ieee->dev:%p\n",
type, Dst, ieee->dev); __func__, type, Dst, ieee->dev);
if (pBA == NULL) { if (pBA == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "pBA is NULL\n"); RTLLIB_DEBUG(RTLLIB_DL_ERR, "pBA is NULL\n");
return NULL; return NULL;
...@@ -148,9 +148,8 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, ...@@ -148,9 +148,8 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,
if (net_ratelimit()) if (net_ratelimit())
RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA,
"========>%s(), Reason" "========>%s(), ReasonCode(%d) sentd to: %pM\n",
"Code(%d) sentd to: %pM\n", __func__, __func__, ReasonCode, dst);
ReasonCode, dst);
memset(&DelbaParamSet, 0, 2); memset(&DelbaParamSet, 0, 2);
...@@ -203,8 +202,8 @@ static void rtllib_send_ADDBAReq(struct rtllib_device *ieee, u8 *dst, ...@@ -203,8 +202,8 @@ static void rtllib_send_ADDBAReq(struct rtllib_device *ieee, u8 *dst,
RT_TRACE(COMP_DBG, "====>to send ADDBAREQ!!!!!\n"); RT_TRACE(COMP_DBG, "====>to send ADDBAREQ!!!!!\n");
softmac_mgmt_xmit(skb, ieee); softmac_mgmt_xmit(skb, ieee);
} else { } else {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function" RTLLIB_DEBUG(RTLLIB_DL_ERR,
" %s()\n", __func__); "alloc skb error in function %s()\n", __func__);
} }
} }
...@@ -217,8 +216,8 @@ static void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst, ...@@ -217,8 +216,8 @@ static void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst,
if (skb) if (skb)
softmac_mgmt_xmit(skb, ieee); softmac_mgmt_xmit(skb, ieee);
else else
RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function" RTLLIB_DEBUG(RTLLIB_DL_ERR,
" %s()\n", __func__); "alloc skb error in function %s()\n", __func__);
} }
static void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst, static void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst,
...@@ -231,8 +230,8 @@ static void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst, ...@@ -231,8 +230,8 @@ static void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst,
if (skb) if (skb)
softmac_mgmt_xmit(skb, ieee); softmac_mgmt_xmit(skb, ieee);
else else
RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function" RTLLIB_DEBUG(RTLLIB_DL_ERR,
" %s()\n", __func__); "alloc skb error in function %s()\n", __func__);
} }
int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
...@@ -247,8 +246,9 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -247,8 +246,9 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
struct rx_ts_record *pTS = NULL; struct rx_ts_record *pTS = NULL;
if (skb->len < sizeof(struct rtllib_hdr_3addr) + 9) { if (skb->len < sizeof(struct rtllib_hdr_3addr) + 9) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in BAREQ(%d / " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"%d)\n", (int)skb->len, " Invalid skb len in BAREQ(%d / %d)\n",
(int)skb->len,
(int)(sizeof(struct rtllib_hdr_3addr) + 9)); (int)(sizeof(struct rtllib_hdr_3addr) + 9));
return -1; return -1;
} }
...@@ -269,8 +269,8 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -269,8 +269,8 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
(ieee->pHTInfo->bCurrentHTSupport == false) || (ieee->pHTInfo->bCurrentHTSupport == false) ||
(ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) { (ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) {
rc = ADDBA_STATUS_REFUSED; rc = ADDBA_STATUS_REFUSED;
RTLLIB_DEBUG(RTLLIB_DL_ERR, "Failed to reply on ADDBA_REQ as " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"some capability is not ready(%d, %d)\n", "Failed to reply on ADDBA_REQ as some capability is not ready(%d, %d)\n",
ieee->current_network.qos_data.active, ieee->current_network.qos_data.active,
ieee->pHTInfo->bCurrentHTSupport); ieee->pHTInfo->bCurrentHTSupport);
goto OnADDBAReq_Fail; goto OnADDBAReq_Fail;
...@@ -285,8 +285,8 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -285,8 +285,8 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) { if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) {
rc = ADDBA_STATUS_INVALID_PARAM; rc = ADDBA_STATUS_INVALID_PARAM;
RTLLIB_DEBUG(RTLLIB_DL_ERR, "BA Policy is not correct in " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"%s()\n", __func__); "BA Policy is not correct in %s()\n", __func__);
goto OnADDBAReq_Fail; goto OnADDBAReq_Fail;
} }
...@@ -333,8 +333,9 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -333,8 +333,9 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
u16 ReasonCode; u16 ReasonCode;
if (skb->len < sizeof(struct rtllib_hdr_3addr) + 9) { if (skb->len < sizeof(struct rtllib_hdr_3addr) + 9) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in BARSP(%d / " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"%d)\n", (int)skb->len, "Invalid skb len in BARSP(%d / %d)\n",
(int)skb->len,
(int)(sizeof(struct rtllib_hdr_3addr) + 9)); (int)(sizeof(struct rtllib_hdr_3addr) + 9));
return -1; return -1;
} }
...@@ -351,8 +352,8 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -351,8 +352,8 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
if (ieee->current_network.qos_data.active == 0 || if (ieee->current_network.qos_data.active == 0 ||
ieee->pHTInfo->bCurrentHTSupport == false || ieee->pHTInfo->bCurrentHTSupport == false ||
ieee->pHTInfo->bCurrentAMPDUEnable == false) { ieee->pHTInfo->bCurrentAMPDUEnable == false) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "reject to ADDBA_RSP as some capab" RTLLIB_DEBUG(RTLLIB_DL_ERR,
"ility is not ready(%d, %d, %d)\n", "reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",
ieee->current_network.qos_data.active, ieee->current_network.qos_data.active,
ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bCurrentHTSupport,
ieee->pHTInfo->bCurrentAMPDUEnable); ieee->pHTInfo->bCurrentAMPDUEnable);
...@@ -374,18 +375,19 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -374,18 +375,19 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
if (pAdmittedBA->bValid == true) { if (pAdmittedBA->bValid == true) {
RTLLIB_DEBUG(RTLLIB_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp." RTLLIB_DEBUG(RTLLIB_DL_BA,
" Drop because already admit it!\n"); "OnADDBARsp(): Recv ADDBA Rsp. Drop because already admit it!\n");
return -1; return -1;
} else if ((pPendingBA->bValid == false) || } else if ((pPendingBA->bValid == false) ||
(*pDialogToken != pPendingBA->DialogToken)) { (*pDialogToken != pPendingBA->DialogToken)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "OnADDBARsp(): Recv ADDBA Rsp. " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"BA invalid, DELBA!\n"); "OnADDBARsp(): Recv ADDBA Rsp. BA invalid, DELBA!\n");
ReasonCode = DELBA_REASON_UNKNOWN_BA; ReasonCode = DELBA_REASON_UNKNOWN_BA;
goto OnADDBARsp_Reject; goto OnADDBARsp_Reject;
} else { } else {
RTLLIB_DEBUG(RTLLIB_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp. BA " RTLLIB_DEBUG(RTLLIB_DL_BA,
"is admitted! Status code:%X\n", *pStatusCode); "OnADDBARsp(): Recv ADDBA Rsp. BA is admitted! Status code:%X\n",
*pStatusCode);
DeActivateBAEntry(ieee, pPendingBA); DeActivateBAEntry(ieee, pPendingBA);
} }
...@@ -432,16 +434,17 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -432,16 +434,17 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
u8 *dst = NULL; u8 *dst = NULL;
if (skb->len < sizeof(struct rtllib_hdr_3addr) + 6) { if (skb->len < sizeof(struct rtllib_hdr_3addr) + 6) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in DELBA(%d /" RTLLIB_DEBUG(RTLLIB_DL_ERR,
" %d)\n", (int)skb->len, "Invalid skb len in DELBA(%d / %d)\n",
(int)skb->len,
(int)(sizeof(struct rtllib_hdr_3addr) + 6)); (int)(sizeof(struct rtllib_hdr_3addr) + 6));
return -1; return -1;
} }
if (ieee->current_network.qos_data.active == 0 || if (ieee->current_network.qos_data.active == 0 ||
ieee->pHTInfo->bCurrentHTSupport == false) { ieee->pHTInfo->bCurrentHTSupport == false) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "received DELBA while QOS or HT " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"is not supported(%d, %d)\n", "received DELBA while QOS or HT is not supported(%d, %d)\n",
ieee->current_network. qos_data.active, ieee->current_network. qos_data.active,
ieee->pHTInfo->bCurrentHTSupport); ieee->pHTInfo->bCurrentHTSupport);
return -1; return -1;
...@@ -459,8 +462,9 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -459,8 +462,9 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
if (!GetTs(ieee, (struct ts_common_info **)&pRxTs, dst, if (!GetTs(ieee, (struct ts_common_info **)&pRxTs, dst,
(u8)pDelBaParamSet->field.TID, RX_DIR, false)) { (u8)pDelBaParamSet->field.TID, RX_DIR, false)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't get TS for RXTS in " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"%s().dst: %pM TID:%d\n", __func__, dst, "can't get TS for RXTS in %s().dst: %pM TID:%d\n",
__func__, dst,
(u8)pDelBaParamSet->field.TID); (u8)pDelBaParamSet->field.TID);
return -1; return -1;
} }
...@@ -471,8 +475,9 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -471,8 +475,9 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
if (!GetTs(ieee, (struct ts_common_info **)&pTxTs, dst, if (!GetTs(ieee, (struct ts_common_info **)&pTxTs, dst,
(u8)pDelBaParamSet->field.TID, TX_DIR, false)) { (u8)pDelBaParamSet->field.TID, TX_DIR, false)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't get TS for TXTS in " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"%s()\n", __func__); "can't get TS for TXTS in %s()\n",
__func__);
return -1; return -1;
} }
......
drivers/staging/rtl8192e/rtl819x_HTProc.c
View file @ 0822339b
...@@ -294,8 +294,8 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, ...@@ -294,8 +294,8 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,
struct ht_capab_ele *pCapELE = NULL; struct ht_capab_ele *pCapELE = NULL;
if ((posHTCap == NULL) || (pHT == NULL)) { if ((posHTCap == NULL) || (pHT == NULL)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "posHTCap or pHTInfo can't be " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"null in HTConstructCapabilityElement()\n"); "posHTCap or pHTInfo can't be null in HTConstructCapabilityElement()\n");
return; return;
} }
memset(posHTCap, 0, *len); memset(posHTCap, 0, *len);
...@@ -331,9 +331,9 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, ...@@ -331,9 +331,9 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,
pCapELE->LSigTxopProtect = 0; pCapELE->LSigTxopProtect = 0;
RTLLIB_DEBUG(RTLLIB_DL_HT, "TX HT cap/info ele BW=%d MaxAMSDUSize:%d " RTLLIB_DEBUG(RTLLIB_DL_HT,
"DssCCk:%d\n", pCapELE->ChlWidth, pCapELE->MaxAMSDUSize, "TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
pCapELE->DssCCk); pCapELE->ChlWidth, pCapELE->MaxAMSDUSize, pCapELE->DssCCk);
if (IsEncrypt) { if (IsEncrypt) {
pCapELE->MPDUDensity = 7; pCapELE->MPDUDensity = 7;
...@@ -376,8 +376,8 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo, ...@@ -376,8 +376,8 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo,
struct ht_info_ele *pHTInfoEle = (struct ht_info_ele *)posHTInfo; struct ht_info_ele *pHTInfoEle = (struct ht_info_ele *)posHTInfo;
if ((posHTInfo == NULL) || (pHTInfoEle == NULL)) { if ((posHTInfo == NULL) || (pHTInfoEle == NULL)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "posHTInfo or pHTInfoEle can't be " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"null in HTConstructInfoElement()\n"); "posHTInfo or pHTInfoEle can't be null in HTConstructInfoElement()\n");
return; return;
} }
...@@ -416,8 +416,8 @@ void HTConstructRT2RTAggElement(struct rtllib_device *ieee, u8 *posRT2RTAgg, ...@@ -416,8 +416,8 @@ void HTConstructRT2RTAggElement(struct rtllib_device *ieee, u8 *posRT2RTAgg,
u8 *len) u8 *len)
{ {
if (posRT2RTAgg == NULL) { if (posRT2RTAgg == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "posRT2RTAgg can't be null in " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"HTConstructRT2RTAggElement()\n"); "posRT2RTAgg can't be null in HTConstructRT2RTAggElement()\n");
return; return;
} }
memset(posRT2RTAgg, 0, *len); memset(posRT2RTAgg, 0, *len);
...@@ -440,8 +440,8 @@ static u8 HT_PickMCSRate(struct rtllib_device *ieee, u8 *pOperateMCS) ...@@ -440,8 +440,8 @@ static u8 HT_PickMCSRate(struct rtllib_device *ieee, u8 *pOperateMCS)
u8 i; u8 i;
if (pOperateMCS == NULL) { if (pOperateMCS == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "pOperateMCS can't be null" RTLLIB_DEBUG(RTLLIB_DL_ERR,
" in HT_PickMCSRate()\n"); "pOperateMCS can't be null in HT_PickMCSRate()\n");
return false; return false;
} }
...@@ -475,8 +475,8 @@ u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet, ...@@ -475,8 +475,8 @@ u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet,
u8 availableMcsRate[16]; u8 availableMcsRate[16];
if (pMCSRateSet == NULL || pMCSFilter == NULL) { if (pMCSRateSet == NULL || pMCSFilter == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "pMCSRateSet or pMCSFilter can't " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"be null in HTGetHighestMCSRate()\n"); "pMCSRateSet or pMCSFilter can't be null in HTGetHighestMCSRate()\n");
return false; return false;
} }
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
...@@ -541,8 +541,8 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ...@@ -541,8 +541,8 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34}; static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34};
if (pHTInfo->bCurrentHTSupport == false) { if (pHTInfo->bCurrentHTSupport == false) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "<=== HTOnAssocRsp(): " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"HT_DISABLE\n"); "<=== HTOnAssocRsp(): HT_DISABLE\n");
return; return;
} }
RTLLIB_DEBUG(RTLLIB_DL_HT, "===> HTOnAssocRsp_wq(): HT_ENABLE\n"); RTLLIB_DEBUG(RTLLIB_DL_HT, "===> HTOnAssocRsp_wq(): HT_ENABLE\n");
...@@ -843,8 +843,8 @@ u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame) ...@@ -843,8 +843,8 @@ u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame)
{ {
if (ieee->pHTInfo->bCurrentHTSupport) { if (ieee->pHTInfo->bCurrentHTSupport) {
if ((IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) == 1) { if ((IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) == 1) {
RTLLIB_DEBUG(RTLLIB_DL_HT, "HT CONTROL FILED " RTLLIB_DEBUG(RTLLIB_DL_HT,
"EXIST!!\n"); "HT CONTROL FILED EXIST!!\n");
return true; return true;
} }
} }
......
drivers/staging/rtl8192e/rtl819x_TSProc.c
View file @ 0822339b
...@@ -58,9 +58,9 @@ static void RxPktPendingTimeout(unsigned long data) ...@@ -58,9 +58,9 @@ static void RxPktPendingTimeout(unsigned long data)
pRxTs->RxIndicateSeq = pRxTs->RxIndicateSeq =
(pRxTs->RxIndicateSeq + 1) % 4096; (pRxTs->RxIndicateSeq + 1) % 4096;
RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Indicate" RTLLIB_DEBUG(RTLLIB_DL_REORDER,
" SeqNum: %d\n", __func__, "%s(): Indicate SeqNum: %d\n",
pReorderEntry->SeqNum); __func__, pReorderEntry->SeqNum);
ieee->stats_IndicateArray[index] = ieee->stats_IndicateArray[index] =
pReorderEntry->prxb; pReorderEntry->prxb;
index++; index++;
...@@ -78,8 +78,8 @@ static void RxPktPendingTimeout(unsigned long data) ...@@ -78,8 +78,8 @@ static void RxPktPendingTimeout(unsigned long data)
pRxTs->RxTimeoutIndicateSeq = 0xffff; pRxTs->RxTimeoutIndicateSeq = 0xffff;
if (index > REORDER_WIN_SIZE) { if (index > REORDER_WIN_SIZE) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket():" RTLLIB_DEBUG(RTLLIB_DL_ERR,
" Rx Reorder struct buffer full!!\n"); "RxReorderIndicatePacket(): Rx Reorder struct buffer full!!\n");
spin_unlock_irqrestore(&(ieee->reorder_spinlock), spin_unlock_irqrestore(&(ieee->reorder_spinlock),
flags); flags);
return; return;
...@@ -104,8 +104,8 @@ static void TsAddBaProcess(unsigned long data) ...@@ -104,8 +104,8 @@ static void TsAddBaProcess(unsigned long data)
TxTsRecord[num]); TxTsRecord[num]);
TsInitAddBA(ieee, pTxTs, BA_POLICY_IMMEDIATE, false); TsInitAddBA(ieee, pTxTs, BA_POLICY_IMMEDIATE, false);
RTLLIB_DEBUG(RTLLIB_DL_BA, "TsAddBaProcess(): ADDBA Req is " RTLLIB_DEBUG(RTLLIB_DL_BA,
"started!!\n"); "TsAddBaProcess(): ADDBA Req is started!!\n");
} }
static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
...@@ -313,16 +313,17 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, ...@@ -313,16 +313,17 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
u8 UP = 0; u8 UP = 0;
if (is_multicast_ether_addr(Addr)) { if (is_multicast_ether_addr(Addr)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR! get TS for Broadcast or " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"Multicast\n"); "ERR! get TS for Broadcast or Multicast\n");
return false; return false;
} }
if (ieee->current_network.qos_data.supported == 0) { if (ieee->current_network.qos_data.supported == 0) {
UP = 0; UP = 0;
} else { } else {
if (!IsACValid(TID)) { if (!IsACValid(TID)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR! in %s(), TID(%d) is " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"not valid\n", __func__, TID); "ERR! in %s(), TID(%d) is not valid\n",
__func__, TID);
return false; return false;
} }
...@@ -351,8 +352,8 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, ...@@ -351,8 +352,8 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
return true; return true;
} else { } else {
if (!bAddNewTs) { if (!bAddNewTs) {
RTLLIB_DEBUG(RTLLIB_DL_TS, "add new TS failed" RTLLIB_DEBUG(RTLLIB_DL_TS,
"(tid:%d)\n", UP); "add new TS failed(tid:%d)\n", UP);
return false; return false;
} else { } else {
union tspec_body TSpec; union tspec_body TSpec;
...@@ -390,10 +391,9 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, ...@@ -390,10 +391,9 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
ResetRxTsEntry(tmp); ResetRxTsEntry(tmp);
} }
RTLLIB_DEBUG(RTLLIB_DL_TS, "to init current TS" RTLLIB_DEBUG(RTLLIB_DL_TS,
", UP:%d, Dir:%d, addr: %pM" "to init current TS, UP:%d, Dir:%d, addr: %pM ppTs=%p\n",
" ppTs=%p\n", UP, Dir, UP, Dir, Addr, *ppTS);
Addr, *ppTS);
pTSInfo->field.ucTrafficType = 0; pTSInfo->field.ucTrafficType = 0;
pTSInfo->field.ucTSID = UP; pTSInfo->field.ucTSID = UP;
pTSInfo->field.ucDirection = Dir; pTSInfo->field.ucDirection = Dir;
...@@ -410,10 +410,9 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, ...@@ -410,10 +410,9 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
return true; return true;
} else { } else {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR!!in function " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"%s() There is not enough dir=%d" "ERR!!in function %s() There is not enough dir=%d(0=up down=1) TS record to be used!!",
"(0=up down=1) TS record to be " __func__, Dir);
"used!!", __func__, Dir);
return false; return false;
} }
} }
...@@ -438,8 +437,8 @@ static void RemoveTsEntry(struct rtllib_device *ieee, struct ts_common_info *pTs ...@@ -438,8 +437,8 @@ static void RemoveTsEntry(struct rtllib_device *ieee, struct ts_common_info *pTs
pRxReorderEntry = (struct rx_reorder_entry *) pRxReorderEntry = (struct rx_reorder_entry *)
list_entry(pRxTS->RxPendingPktList.prev, list_entry(pRxTS->RxPendingPktList.prev,
struct rx_reorder_entry, List); struct rx_reorder_entry, List);
RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Delete SeqNum " RTLLIB_DEBUG(RTLLIB_DL_REORDER,
"%d!\n", __func__, "%s(): Delete SeqNum %d!\n", __func__,
pRxReorderEntry->SeqNum); pRxReorderEntry->SeqNum);
list_del_init(&pRxReorderEntry->List); list_del_init(&pRxReorderEntry->List);
{ {
...@@ -539,13 +538,13 @@ void TsStartAddBaProcess(struct rtllib_device *ieee, struct tx_ts_record *pTxTS) ...@@ -539,13 +538,13 @@ void TsStartAddBaProcess(struct rtllib_device *ieee, struct tx_ts_record *pTxTS)
pTxTS->bAddBaReqInProgress = true; pTxTS->bAddBaReqInProgress = true;
if (pTxTS->bAddBaReqDelayed) { if (pTxTS->bAddBaReqDelayed) {
RTLLIB_DEBUG(RTLLIB_DL_BA, "TsStartAddBaProcess(): " RTLLIB_DEBUG(RTLLIB_DL_BA,
"Delayed Start ADDBA after 60 sec!!\n"); "TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n");
mod_timer(&pTxTS->TsAddBaTimer, jiffies + mod_timer(&pTxTS->TsAddBaTimer, jiffies +
msecs_to_jiffies(TS_ADDBA_DELAY)); msecs_to_jiffies(TS_ADDBA_DELAY));
} else { } else {
RTLLIB_DEBUG(RTLLIB_DL_BA, "TsStartAddBaProcess(): " RTLLIB_DEBUG(RTLLIB_DL_BA,
"Immediately Start ADDBA now!!\n"); "TsStartAddBaProcess(): Immediately Start ADDBA now!!\n");
mod_timer(&pTxTS->TsAddBaTimer, jiffies+10); mod_timer(&pTxTS->TsAddBaTimer, jiffies+10);
} }
} else } else
......
drivers/staging/rtl8192e/rtllib_crypt.c
View file @ 0822339b
...@@ -62,8 +62,9 @@ void rtllib_crypt_deinit_handler(unsigned long data) ...@@ -62,8 +62,9 @@ void rtllib_crypt_deinit_handler(unsigned long data)
spin_lock_irqsave(info->lock, flags); spin_lock_irqsave(info->lock, flags);
rtllib_crypt_deinit_entries(info, 0); rtllib_crypt_deinit_entries(info, 0);
if (!list_empty(&info->crypt_deinit_list)) { if (!list_empty(&info->crypt_deinit_list)) {
printk(KERN_DEBUG "%s: entries remaining in delayed crypt " printk(KERN_DEBUG
"deletion list\n", info->name); "%s: entries remaining in delayed crypt deletion list\n",
info->name);
info->crypt_deinit_timer.expires = jiffies + HZ; info->crypt_deinit_timer.expires = jiffies + HZ;
add_timer(&info->crypt_deinit_timer); add_timer(&info->crypt_deinit_timer);
} }
...@@ -145,8 +146,8 @@ int rtllib_unregister_crypto_ops(struct lib80211_crypto_ops *ops) ...@@ -145,8 +146,8 @@ int rtllib_unregister_crypto_ops(struct lib80211_crypto_ops *ops)
spin_unlock_irqrestore(&hcrypt->lock, flags); spin_unlock_irqrestore(&hcrypt->lock, flags);
if (del_alg) { if (del_alg) {
printk(KERN_DEBUG "rtllib_crypt: unregistered algorithm " printk(KERN_DEBUG "rtllib_crypt: unregistered algorithm '%s'\n",
"'%s'\n", ops->name); ops->name);
kfree(del_alg); kfree(del_alg);
} }
...@@ -237,8 +238,9 @@ void __exit rtllib_crypto_deinit(void) ...@@ -237,8 +238,9 @@ void __exit rtllib_crypto_deinit(void)
struct rtllib_crypto_alg *alg = struct rtllib_crypto_alg *alg =
(struct rtllib_crypto_alg *) ptr; (struct rtllib_crypto_alg *) ptr;
list_del(ptr); list_del(ptr);
printk(KERN_DEBUG "rtllib_crypt: unregistered algorithm " printk(KERN_DEBUG
"'%s' (deinit)\n", alg->ops->name); "rtllib_crypt: unregistered algorithm '%s' (deinit)\n",
alg->ops->name);
kfree(alg); kfree(alg);
} }
......
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
View file @ 0822339b
...@@ -69,8 +69,7 @@ static void *rtllib_ccmp_init(int key_idx) ...@@ -69,8 +69,7 @@ static void *rtllib_ccmp_init(int key_idx)
priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC); priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tfm)) { if (IS_ERR(priv->tfm)) {
pr_debug("rtllib_crypt_ccmp: could not allocate " pr_debug("rtllib_crypt_ccmp: could not allocate crypto API aes\n");
"crypto API aes\n");
priv->tfm = NULL; priv->tfm = NULL;
goto fail; goto fail;
} }
...@@ -278,23 +277,22 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -278,23 +277,22 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
keyidx = pos[3]; keyidx = pos[3];
if (!(keyidx & (1 << 5))) { if (!(keyidx & (1 << 5))) {
if (net_ratelimit()) { if (net_ratelimit()) {
pr_debug("CCMP: received packet without ExtIV" pr_debug("CCMP: received packet without ExtIV flag from %pM\n",
" flag from %pM\n", hdr->addr2); hdr->addr2);
} }
key->dot11RSNAStatsCCMPFormatErrors++; key->dot11RSNAStatsCCMPFormatErrors++;
return -2; return -2;
} }
keyidx >>= 6; keyidx >>= 6;
if (key->key_idx != keyidx) { if (key->key_idx != keyidx) {
pr_debug("CCMP: RX tkey->key_idx=%d frame " pr_debug("CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
"keyidx=%d priv=%p\n", key->key_idx, keyidx, priv); key->key_idx, keyidx, priv);
return -6; return -6;
} }
if (!key->key_set) { if (!key->key_set) {
if (net_ratelimit()) { if (net_ratelimit()) {
pr_debug("CCMP: received packet from %pM" pr_debug("CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
" with keyid=%d that does not have a configured" hdr->addr2, keyidx);
" key\n", hdr->addr2, keyidx);
} }
return -3; return -3;
} }
...@@ -341,8 +339,8 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -341,8 +339,8 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
if (memcmp(mic, a, CCMP_MIC_LEN) != 0) { if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
if (net_ratelimit()) { if (net_ratelimit()) {
pr_debug("CCMP: decrypt failed: STA=" pr_debug("CCMP: decrypt failed: STA= %pM\n",
" %pM\n", hdr->addr2); hdr->addr2);
} }
key->dot11RSNAStatsCCMPDecryptErrors++; key->dot11RSNAStatsCCMPDecryptErrors++;
return -5; return -5;
...@@ -419,9 +417,7 @@ static void rtllib_ccmp_print_stats(struct seq_file *m, void *priv) ...@@ -419,9 +417,7 @@ static void rtllib_ccmp_print_stats(struct seq_file *m, void *priv)
struct rtllib_ccmp_data *ccmp = priv; struct rtllib_ccmp_data *ccmp = priv;
seq_printf(m, seq_printf(m,
"key[%d] alg=CCMP key_set=%d " "key[%d] alg=CCMP key_set=%d tx_pn=%pM rx_pn=%pM format_errors=%d replays=%d decrypt_errors=%d\n",
"tx_pn=%pM rx_pn=%pM "
"format_errors=%d replays=%d decrypt_errors=%d\n",
ccmp->key_idx, ccmp->key_set, ccmp->key_idx, ccmp->key_set,
ccmp->tx_pn, ccmp->rx_pn, ccmp->tx_pn, ccmp->rx_pn,
ccmp->dot11RSNAStatsCCMPFormatErrors, ccmp->dot11RSNAStatsCCMPFormatErrors,
......
drivers/staging/rtl8192e/rtllib_crypt_tkip.c
View file @ 0822339b
...@@ -66,8 +66,8 @@ static void *rtllib_tkip_init(int key_idx) ...@@ -66,8 +66,8 @@ static void *rtllib_tkip_init(int key_idx)
priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
CRYPTO_ALG_ASYNC); CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tx_tfm_arc4)) { if (IS_ERR(priv->tx_tfm_arc4)) {
printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate " printk(KERN_DEBUG
"crypto API arc4\n"); "rtllib_crypt_tkip: could not allocate crypto API arc4\n");
priv->tx_tfm_arc4 = NULL; priv->tx_tfm_arc4 = NULL;
goto fail; goto fail;
} }
...@@ -75,8 +75,8 @@ static void *rtllib_tkip_init(int key_idx) ...@@ -75,8 +75,8 @@ static void *rtllib_tkip_init(int key_idx)
priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0, priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
CRYPTO_ALG_ASYNC); CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tx_tfm_michael)) { if (IS_ERR(priv->tx_tfm_michael)) {
printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate " printk(KERN_DEBUG
"crypto API michael_mic\n"); "rtllib_crypt_tkip: could not allocate crypto API michael_mic\n");
priv->tx_tfm_michael = NULL; priv->tx_tfm_michael = NULL;
goto fail; goto fail;
} }
...@@ -84,8 +84,8 @@ static void *rtllib_tkip_init(int key_idx) ...@@ -84,8 +84,8 @@ static void *rtllib_tkip_init(int key_idx)
priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
CRYPTO_ALG_ASYNC); CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->rx_tfm_arc4)) { if (IS_ERR(priv->rx_tfm_arc4)) {
printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate " printk(KERN_DEBUG
"crypto API arc4\n"); "rtllib_crypt_tkip: could not allocate crypto API arc4\n");
priv->rx_tfm_arc4 = NULL; priv->rx_tfm_arc4 = NULL;
goto fail; goto fail;
} }
...@@ -93,8 +93,8 @@ static void *rtllib_tkip_init(int key_idx) ...@@ -93,8 +93,8 @@ static void *rtllib_tkip_init(int key_idx)
priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0, priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
CRYPTO_ALG_ASYNC); CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->rx_tfm_michael)) { if (IS_ERR(priv->rx_tfm_michael)) {
printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate " printk(KERN_DEBUG
"crypto API michael_mic\n"); "rtllib_crypt_tkip: could not allocate crypto API michael_mic\n");
priv->rx_tfm_michael = NULL; priv->rx_tfm_michael = NULL;
goto fail; goto fail;
} }
...@@ -399,22 +399,24 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -399,22 +399,24 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
keyidx = pos[3]; keyidx = pos[3];
if (!(keyidx & (1 << 5))) { if (!(keyidx & (1 << 5))) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "TKIP: received packet without ExtIV" printk(KERN_DEBUG
" flag from %pM\n", hdr->addr2); "TKIP: received packet without ExtIV flag from %pM\n",
hdr->addr2);
} }
return -2; return -2;
} }
keyidx >>= 6; keyidx >>= 6;
if (tkey->key_idx != keyidx) { if (tkey->key_idx != keyidx) {
printk(KERN_DEBUG "TKIP: RX tkey->key_idx=%d frame " printk(KERN_DEBUG
"keyidx=%d priv=%p\n", tkey->key_idx, keyidx, priv); "TKIP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
tkey->key_idx, keyidx, priv);
return -6; return -6;
} }
if (!tkey->key_set) { if (!tkey->key_set) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "TKIP: received packet from %pM" printk(KERN_DEBUG
" with keyid=%d that does not have a configured" "TKIP: received packet from %pM with keyid=%d that does not have a configured key\n",
" key\n", hdr->addr2, keyidx); hdr->addr2, keyidx);
} }
return -3; return -3;
} }
...@@ -427,10 +429,10 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -427,10 +429,10 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
(iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) && (iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) &&
tkey->initialized) { tkey->initialized) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "TKIP: replay detected: STA=" printk(KERN_DEBUG
" %pM previous TSC %08x%04x received " "TKIP: replay detected: STA= %pM previous TSC %08x%04x received TSC %08x%04x\n",
"TSC %08x%04x\n", hdr->addr2, hdr->addr2, tkey->rx_iv32, tkey->rx_iv16,
tkey->rx_iv32, tkey->rx_iv16, iv32, iv16); iv32, iv16);
} }
tkey->dot11RSNAStatsTKIPReplays++; tkey->dot11RSNAStatsTKIPReplays++;
return -4; return -4;
...@@ -451,8 +453,8 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -451,8 +453,8 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16); crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) { if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG ": TKIP: failed to decrypt " printk(KERN_DEBUG
"received packet from %pM\n", ": TKIP: failed to decrypt received packet from %pM\n",
hdr->addr2); hdr->addr2);
} }
return -7; return -7;
...@@ -472,8 +474,9 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -472,8 +474,9 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
tkey->rx_phase1_done = 0; tkey->rx_phase1_done = 0;
} }
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "TKIP: ICV error detected: STA=" printk(KERN_DEBUG
" %pM\n", hdr->addr2); "TKIP: ICV error detected: STA= %pM\n",
hdr->addr2);
} }
tkey->dot11RSNAStatsTKIPICVErrors++; tkey->dot11RSNAStatsTKIPICVErrors++;
return -5; return -5;
...@@ -557,8 +560,8 @@ static int rtllib_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -557,8 +560,8 @@ static int rtllib_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv)
hdr = (struct rtllib_hdr_4addr *) skb->data; hdr = (struct rtllib_hdr_4addr *) skb->data;
if (skb_tailroom(skb) < 8 || skb->len < hdr_len) { if (skb_tailroom(skb) < 8 || skb->len < hdr_len) {
printk(KERN_DEBUG "Invalid packet for Michael MIC add " printk(KERN_DEBUG
"(tailroom=%d hdr_len=%d skb->len=%d)\n", "Invalid packet for Michael MIC add (tailroom=%d hdr_len=%d skb->len=%d)\n",
skb_tailroom(skb), hdr_len, skb->len); skb_tailroom(skb), hdr_len, skb->len);
return -1; return -1;
} }
...@@ -621,8 +624,8 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx, ...@@ -621,8 +624,8 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx,
struct rtllib_hdr_4addr *hdr; struct rtllib_hdr_4addr *hdr;
hdr = (struct rtllib_hdr_4addr *) skb->data; hdr = (struct rtllib_hdr_4addr *) skb->data;
printk(KERN_DEBUG "%s: Michael MIC verification failed for " printk(KERN_DEBUG
"MSDU from %pM keyidx=%d\n", "%s: Michael MIC verification failed for MSDU from %pM keyidx=%d\n",
skb->dev ? skb->dev->name : "N/A", hdr->addr2, skb->dev ? skb->dev->name : "N/A", hdr->addr2,
keyidx); keyidx);
printk(KERN_DEBUG "%d\n", printk(KERN_DEBUG "%d\n",
...@@ -717,10 +720,7 @@ static void rtllib_tkip_print_stats(struct seq_file *m, void *priv) ...@@ -717,10 +720,7 @@ static void rtllib_tkip_print_stats(struct seq_file *m, void *priv)
struct rtllib_tkip_data *tkip = priv; struct rtllib_tkip_data *tkip = priv;
seq_printf(m, seq_printf(m,
"key[%d] alg=TKIP key_set=%d " "key[%d] alg=TKIP key_set=%d tx_pn=%02x%02x%02x%02x%02x%02x rx_pn=%02x%02x%02x%02x%02x%02x replays=%d icv_errors=%d local_mic_failures=%d\n",
"tx_pn=%02x%02x%02x%02x%02x%02x "
"rx_pn=%02x%02x%02x%02x%02x%02x "
"replays=%d icv_errors=%d local_mic_failures=%d\n",
tkip->key_idx, tkip->key_set, tkip->key_idx, tkip->key_set,
(tkip->tx_iv32 >> 24) & 0xff, (tkip->tx_iv32 >> 24) & 0xff,
(tkip->tx_iv32 >> 16) & 0xff, (tkip->tx_iv32 >> 16) & 0xff,
......
drivers/staging/rtl8192e/rtllib_crypt_wep.c
View file @ 0822339b
...@@ -44,15 +44,13 @@ static void *prism2_wep_init(int keyidx) ...@@ -44,15 +44,13 @@ static void *prism2_wep_init(int keyidx)
priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tx_tfm)) { if (IS_ERR(priv->tx_tfm)) {
pr_debug("rtllib_crypt_wep: could not allocate " pr_debug("rtllib_crypt_wep: could not allocate crypto API arc4\n");
"crypto API arc4\n");
priv->tx_tfm = NULL; priv->tx_tfm = NULL;
goto fail; goto fail;
} }
priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->rx_tfm)) { if (IS_ERR(priv->rx_tfm)) {
pr_debug("rtllib_crypt_wep: could not allocate " pr_debug("rtllib_crypt_wep: could not allocate crypto API arc4\n");
"crypto API arc4\n");
priv->rx_tfm = NULL; priv->rx_tfm = NULL;
goto fail; goto fail;
} }
...@@ -108,9 +106,9 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -108,9 +106,9 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 || if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 ||
skb->len < hdr_len){ skb->len < hdr_len){
printk(KERN_ERR "Error!!! headroom=%d tailroom=%d skblen=%d" printk(KERN_ERR
" hdr_len=%d\n", skb_headroom(skb), skb_tailroom(skb), "Error!!! headroom=%d tailroom=%d skblen=%d hdr_len=%d\n",
skb->len, hdr_len); skb_headroom(skb), skb_tailroom(skb), skb->len, hdr_len);
return -1; return -1;
} }
len = skb->len - hdr_len; len = skb->len - hdr_len;
......
drivers/staging/rtl8192e/rtllib_softmac.c
View file @ 0822339b
...@@ -277,8 +277,9 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee) ...@@ -277,8 +277,9 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
/* as for the completion function, it does not need /* as for the completion function, it does not need
* to check it any more. * to check it any more.
* */ * */
printk(KERN_INFO "%s():insert to waitqueue, queue_index" printk(KERN_INFO
":%d!\n", __func__, tcb_desc->queue_index); "%s():insert to waitqueue, queue_index:%d!\n",
__func__, tcb_desc->queue_index);
skb_queue_tail(&ieee->skb_waitQ[tcb_desc->queue_index], skb_queue_tail(&ieee->skb_waitQ[tcb_desc->queue_index],
skb); skb);
} else { } else {
...@@ -1418,8 +1419,9 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon, ...@@ -1418,8 +1419,9 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,
if (ieee->assocreq_ies) if (ieee->assocreq_ies)
memcpy(ieee->assocreq_ies, ies, ieee->assocreq_ies_len); memcpy(ieee->assocreq_ies, ies, ieee->assocreq_ies_len);
else { else {
printk(KERN_INFO "%s()Warning: can't alloc memory for assocreq" printk(KERN_INFO
"_ies\n", __func__); "%s()Warning: can't alloc memory for assocreq_ies\n",
__func__);
ieee->assocreq_ies_len = 0; ieee->assocreq_ies_len = 0;
} }
return skb; return skb;
...@@ -1503,8 +1505,7 @@ static void rtllib_auth_challenge(struct rtllib_device *ieee, u8 *challenge, int ...@@ -1503,8 +1505,7 @@ static void rtllib_auth_challenge(struct rtllib_device *ieee, u8 *challenge, int
*(c++) = chlen; *(c++) = chlen;
memcpy(c, challenge, chlen); memcpy(c, challenge, chlen);
RTLLIB_DEBUG_MGMT("Sending authentication challenge " RTLLIB_DEBUG_MGMT("Sending authentication challenge response\n");
"response\n");
rtllib_encrypt_fragment(ieee, skb, rtllib_encrypt_fragment(ieee, skb,
sizeof(struct rtllib_hdr_3addr)); sizeof(struct rtllib_hdr_3addr));
...@@ -1564,8 +1565,8 @@ static void rtllib_associate_complete_wq(void *data) ...@@ -1564,8 +1565,8 @@ static void rtllib_associate_complete_wq(void *data)
printk(KERN_INFO "Successfully associated, ht enabled\n"); printk(KERN_INFO "Successfully associated, ht enabled\n");
HTOnAssocRsp(ieee); HTOnAssocRsp(ieee);
} else { } else {
printk(KERN_INFO "Successfully associated, ht not " printk(KERN_INFO
"enabled(%d, %d)\n", "Successfully associated, ht not enabled(%d, %d)\n",
ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bCurrentHTSupport,
ieee->pHTInfo->bEnableHT); ieee->pHTInfo->bEnableHT);
memset(ieee->dot11HTOperationalRateSet, 0, 16); memset(ieee->dot11HTOperationalRateSet, 0, 16);
...@@ -1623,8 +1624,9 @@ static void rtllib_associate_procedure_wq(void *data) ...@@ -1623,8 +1624,9 @@ static void rtllib_associate_procedure_wq(void *data)
ieee->current_network.channel); ieee->current_network.channel);
HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
if (ieee->eRFPowerState == eRfOff) { if (ieee->eRFPowerState == eRfOff) {
RT_TRACE(COMP_DBG, "=============>%s():Rf state is eRfOff," RT_TRACE(COMP_DBG,
" schedule ipsleave wq again,return\n", __func__); "=============>%s():Rf state is eRfOff, schedule ipsleave wq again,return\n",
__func__);
if (ieee->rtllib_ips_leave_wq != NULL) if (ieee->rtllib_ips_leave_wq != NULL)
ieee->rtllib_ips_leave_wq(ieee->dev); ieee->rtllib_ips_leave_wq(ieee->dev);
up(&ieee->wx_sem); up(&ieee->wx_sem);
...@@ -1719,9 +1721,9 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee, ...@@ -1719,9 +1721,9 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
IW_ESSID_MAX_SIZE); IW_ESSID_MAX_SIZE);
ieee->current_network.ssid_len = tmp_ssid_len; ieee->current_network.ssid_len = tmp_ssid_len;
} }
printk(KERN_INFO"Linking with %s,channel:%d, qos:%d, " printk(KERN_INFO
"myHT:%d, networkHT:%d, mode:%x cur_net.flags" "Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d, mode:%x cur_net.flags:0x%x\n",
":0x%x\n", ieee->current_network.ssid, ieee->current_network.ssid,
ieee->current_network.channel, ieee->current_network.channel,
ieee->current_network.qos_data.supported, ieee->current_network.qos_data.supported,
ieee->pHTInfo->bEnableHT, ieee->pHTInfo->bEnableHT,
...@@ -2083,10 +2085,9 @@ static inline void rtllib_sta_ps(struct rtllib_device *ieee) ...@@ -2083,10 +2085,9 @@ static inline void rtllib_sta_ps(struct rtllib_device *ieee)
if ((ieee->ps == RTLLIB_PS_DISABLED || if ((ieee->ps == RTLLIB_PS_DISABLED ||
ieee->iw_mode != IW_MODE_INFRA || ieee->iw_mode != IW_MODE_INFRA ||
ieee->state != RTLLIB_LINKED)) { ieee->state != RTLLIB_LINKED)) {
RT_TRACE(COMP_DBG, "=====>%s(): no need to ps,wake up!! " RT_TRACE(COMP_DBG,
"ieee->ps is %d, ieee->iw_mode is %d, ieee->state" "=====>%s(): no need to ps,wake up!! ieee->ps is %d, ieee->iw_mode is %d, ieee->state is %d\n",
" is %d\n", __func__, ieee->ps, ieee->iw_mode, __func__, ieee->ps, ieee->iw_mode, ieee->state);
ieee->state);
spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2); spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
rtllib_sta_wakeup(ieee, 1); rtllib_sta_wakeup(ieee, 1);
...@@ -2201,8 +2202,8 @@ static void rtllib_process_action(struct rtllib_device *ieee, struct sk_buff *sk ...@@ -2201,8 +2202,8 @@ static void rtllib_process_action(struct rtllib_device *ieee, struct sk_buff *sk
u8 category = 0; u8 category = 0;
if (act == NULL) { if (act == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "error to get payload of " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"action frame\n"); "error to get payload of action frame\n");
return; return;
} }
...@@ -2287,8 +2288,9 @@ inline int rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -2287,8 +2288,9 @@ inline int rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
memcpy(ieee->assocresp_ies, ies, memcpy(ieee->assocresp_ies, ies,
ieee->assocresp_ies_len); ieee->assocresp_ies_len);
else { else {
printk(KERN_INFO "%s()Warning: can't alloc " printk(KERN_INFO
"memory for assocresp_ies\n", __func__); "%s()Warning: can't alloc memory for assocresp_ies\n",
__func__);
ieee->assocresp_ies_len = 0; ieee->assocresp_ies_len = 0;
} }
rtllib_associate_complete(ieee); rtllib_associate_complete(ieee);
...@@ -2353,8 +2355,8 @@ inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -2353,8 +2355,8 @@ inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,
if (ieee->current_network.mode == if (ieee->current_network.mode ==
IEEE_N_24G && bHalfSupportNmode) { IEEE_N_24G && bHalfSupportNmode) {
printk(KERN_INFO "======>enter " printk(KERN_INFO
"half N mode\n"); "======>enter half N mode\n");
ieee->bHalfWirelessN24GMode = ieee->bHalfWirelessN24GMode =
true; true;
} else } else
...@@ -2368,11 +2370,12 @@ inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -2368,11 +2370,12 @@ inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,
} }
} else { } else {
ieee->softmac_stats.rx_auth_rs_err++; ieee->softmac_stats.rx_auth_rs_err++;
RTLLIB_DEBUG_MGMT("Authentication respose" RTLLIB_DEBUG_MGMT("Authentication respose status code 0x%x",
" status code 0x%x", errcode); errcode);
printk(KERN_INFO "Authentication respose " printk(KERN_INFO
"status code 0x%x", errcode); "Authentication respose status code 0x%x",
errcode);
rtllib_associate_abort(ieee); rtllib_associate_abort(ieee);
} }
...@@ -2396,8 +2399,8 @@ inline int rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -2396,8 +2399,8 @@ inline int rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb)
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) && if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
ieee->state == RTLLIB_LINKED && ieee->state == RTLLIB_LINKED &&
(ieee->iw_mode == IW_MODE_INFRA)) { (ieee->iw_mode == IW_MODE_INFRA)) {
printk(KERN_INFO "==========>received disassoc/deauth(%x) " printk(KERN_INFO
"frame, reason code:%x\n", "==========>received disassoc/deauth(%x) frame, reason code:%x\n",
WLAN_FC_GET_STYPE(header->frame_ctl), WLAN_FC_GET_STYPE(header->frame_ctl),
((struct rtllib_disassoc *)skb->data)->reason); ((struct rtllib_disassoc *)skb->data)->reason);
ieee->state = RTLLIB_ASSOCIATING; ieee->state = RTLLIB_ASSOCIATING;
......
drivers/staging/rtl8192e/rtllib_softmac_wx.c
View file @ 0822339b
...@@ -575,8 +575,9 @@ int rtllib_wx_set_power(struct rtllib_device *ieee, ...@@ -575,8 +575,9 @@ int rtllib_wx_set_power(struct rtllib_device *ieee,
if ((!ieee->sta_wake_up) || if ((!ieee->sta_wake_up) ||
(!ieee->enter_sleep_state) || (!ieee->enter_sleep_state) ||
(!ieee->ps_is_queue_empty)) { (!ieee->ps_is_queue_empty)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "%s(): PS mode is tried to be use " RTLLIB_DEBUG(RTLLIB_DL_ERR,
"but driver missed a callback\n\n", __func__); "%s(): PS mode is tried to be use but driver missed a callback\n\n",
__func__);
return -1; return -1;
} }
......
drivers/staging/rtl8192e/rtllib_tx.c
View file @ 0822339b
...@@ -604,8 +604,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) ...@@ -604,8 +604,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
if (ieee->iw_mode == IW_MODE_MONITOR) { if (ieee->iw_mode == IW_MODE_MONITOR) {
txb = rtllib_alloc_txb(1, skb->len, GFP_ATOMIC); txb = rtllib_alloc_txb(1, skb->len, GFP_ATOMIC);
if (unlikely(!txb)) { if (unlikely(!txb)) {
printk(KERN_WARNING "%s: Could not allocate " printk(KERN_WARNING
"TXB\n", "%s: Could not allocate TXB\n",
ieee->dev->name); ieee->dev->name);
goto failed; goto failed;
} }
...@@ -636,8 +636,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) ...@@ -636,8 +636,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
} }
} }
} else if (ETH_P_ARP == ether_type) { } else if (ETH_P_ARP == ether_type) {
printk(KERN_INFO "=================>DHCP " printk(KERN_INFO
"Protocol start tx ARP pkt!!\n"); "=================>DHCP Protocol start tx ARP pkt!!\n");
bdhcp = true; bdhcp = true;
ieee->LPSDelayCnt = ieee->LPSDelayCnt =
ieee->current_network.tim.tim_count; ieee->current_network.tim.tim_count;
......
drivers/staging/rtl8192e/rtllib_wx.c
View file @ 0822339b
...@@ -282,8 +282,7 @@ int rtllib_wx_get_scan(struct rtllib_device *ieee, ...@@ -282,8 +282,7 @@ int rtllib_wx_get_scan(struct rtllib_device *ieee,
ev = rtl819x_translate_scan(ieee, ev, stop, network, ev = rtl819x_translate_scan(ieee, ev, stop, network,
info); info);
else else
RTLLIB_DEBUG_SCAN("Not showing network '%s (" RTLLIB_DEBUG_SCAN("Not showing network '%s ( %pM)' due to age (%lums).\n",
" %pM)' due to age (%lums).\n",
escape_essid(network->ssid, escape_essid(network->ssid,
network->ssid_len), network->ssid_len),
network->bssid, network->bssid,
...@@ -437,8 +436,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, ...@@ -437,8 +436,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
/* No key data - just set the default TX key index */ /* No key data - just set the default TX key index */
if (key_provided) { if (key_provided) {
RTLLIB_DEBUG_WX( RTLLIB_DEBUG_WX("Setting key %d to default Tx key.\n",
"Setting key %d to default Tx key.\n", key); key);
ieee->crypt_info.tx_keyidx = key; ieee->crypt_info.tx_keyidx = key;
sec.active_key = key; sec.active_key = key;
sec.flags |= SEC_ACTIVE_KEY; sec.flags |= SEC_ACTIVE_KEY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7