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
Expand all 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,
0x0e, bMask12Bits, 0x021);
} else {
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): "
"unknown hardware version\n");
RT_TRACE(COMP_ERR,
"PHY_SetRF8256Bandwidth(): unknown hardware version\n");
}
break;
......@@ -66,15 +66,16 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev,
0x0e, bMask12Bits, 0x0e1);
} else {
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): "
"unknown hardware version\n");
RT_TRACE(COMP_ERR,
"PHY_SetRF8256Bandwidth(): unknown hardware version\n");
}
break;
default:
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown "
"Bandwidth: %#X\n", Bandwidth);
RT_TRACE(COMP_ERR,
"PHY_SetRF8256Bandwidth(): unknown Bandwidth: %#X\n",
Bandwidth);
break;
}
......@@ -138,8 +139,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
rtStatus = rtl8192_phy_checkBBAndRF(dev, HW90_BLOCK_RF,
(enum rf90_radio_path)eRFPath);
if (!rtStatus) {
RT_TRACE(COMP_ERR, "PHY_RF8256_Config():Check "
"Radio[%d] Fail!!\n", eRFPath);
RT_TRACE(COMP_ERR,
"PHY_RF8256_Config():Check Radio[%d] Fail!!\n",
eRFPath);
goto phy_RF8256_Config_ParaFile_Fail;
}
......@@ -155,9 +157,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
(enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck,
bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final "
"value: %x\n", eRFPath,
RegOffSetToBeCheck, RF3_Final_Value);
RT_TRACE(COMP_RF,
"RF %d %d register final value: %x\n",
eRFPath, RegOffSetToBeCheck,
RF3_Final_Value);
RetryTimes--;
}
break;
......@@ -170,9 +173,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
(enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck,
bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final "
"value: %x\n", eRFPath,
RegOffSetToBeCheck, RF3_Final_Value);
RT_TRACE(COMP_RF,
"RF %d %d register final value: %x\n",
eRFPath, RegOffSetToBeCheck,
RF3_Final_Value);
RetryTimes--;
}
break;
......@@ -185,9 +189,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
(enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck,
bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final "
"value: %x\n", eRFPath,
RegOffSetToBeCheck, RF3_Final_Value);
RT_TRACE(COMP_RF,
"RF %d %d register final value: %x\n",
eRFPath, RegOffSetToBeCheck,
RF3_Final_Value);
RetryTimes--;
}
break;
......@@ -199,9 +204,10 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
RF3_Final_Value = rtl8192_phy_QueryRFReg(dev,
(enum rf90_radio_path)eRFPath,
RegOffSetToBeCheck, bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final "
"value: %x\n", eRFPath,
RegOffSetToBeCheck, RF3_Final_Value);
RT_TRACE(COMP_RF,
"RF %d %d register final value: %x\n",
eRFPath, RegOffSetToBeCheck,
RF3_Final_Value);
RetryTimes--;
}
break;
......@@ -221,8 +227,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev)
}
if (ret) {
RT_TRACE(COMP_ERR, "phy_RF8256_Config_ParaFile():"
"Radio[%d] Fail!!", eRFPath);
RT_TRACE(COMP_ERR,
"phy_RF8256_Config_ParaFile():Radio[%d] Fail!!",
eRFPath);
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,
switch (element_id) {
case RX_TX_FEEDBACK:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
"RX_TX_FEEDBACK\n");
RT_TRACE(COMP_CMDPKT,
"---->cmpk_message_handle_rx():RX_TX_FEEDBACK\n");
cmpk_handle_tx_feedback(dev, pcmd_buff);
cmd_length = CMPK_RX_TX_FB_SIZE;
break;
case RX_INTERRUPT_STATUS:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
"RX_INTERRUPT_STATUS\n");
RT_TRACE(COMP_CMDPKT,
"---->cmpk_message_handle_rx():RX_INTERRUPT_STATUS\n");
cmpk_handle_interrupt_status(dev, pcmd_buff);
cmd_length = sizeof(struct cmpk_intr_sta);
break;
case BOTH_QUERY_CONFIG:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
"BOTH_QUERY_CONFIG\n");
RT_TRACE(COMP_CMDPKT,
"---->cmpk_message_handle_rx():BOTH_QUERY_CONFIG\n");
cmpk_handle_query_config_rx(dev, pcmd_buff);
cmd_length = CMPK_BOTH_QUERY_CONFIG_SIZE;
break;
case RX_TX_STATUS:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
"RX_TX_STATUS\n");
RT_TRACE(COMP_CMDPKT,
"---->cmpk_message_handle_rx():RX_TX_STATUS\n");
cmpk_handle_tx_status(dev, pcmd_buff);
cmd_length = CMPK_RX_TX_STS_SIZE;
break;
case RX_TX_PER_PKT_FEEDBACK:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
"RX_TX_PER_PKT_FEEDBACK\n");
RT_TRACE(COMP_CMDPKT,
"---->cmpk_message_handle_rx():RX_TX_PER_PKT_FEEDBACK\n");
cmd_length = CMPK_RX_TX_FB_SIZE;
break;
case RX_TX_RATE_HISTORY:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
"RX_TX_HISTORY\n");
RT_TRACE(COMP_CMDPKT,
"---->cmpk_message_handle_rx():RX_TX_HISTORY\n");
cmpk_handle_tx_rate_history(dev, pcmd_buff);
cmd_length = CMPK_TX_RAHIS_SIZE;
break;
default:
RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
"unknown CMD Element\n");
RT_TRACE(COMP_CMDPKT,
"---->cmpk_message_handle_rx():unknown CMD Element\n");
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)
break;
default:
RT_TRACE(COMP_QOS, "SetHwReg8185(): [HW_VAR_"
"ACM_CTRL] acm set failed: eACI is "
"%d\n", eACI);
RT_TRACE(COMP_QOS,
"SetHwReg8185(): [HW_VAR_ACM_CTRL] acm set failed: eACI is %d\n",
eACI);
break;
}
} else {
......@@ -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"
" 0x%X\n", AcmCtrl);
RT_TRACE(COMP_QOS,
"SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
AcmCtrl);
write_nic_byte(dev, AcmHwCtrl, AcmCtrl);
break;
}
......@@ -448,12 +449,12 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
usValue = EEPROM_Default_TxPower;
*((u16 *)(&priv->EEPROMTxPowerLevelCCK[i])) =
usValue;
RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index"
" %d = 0x%02x\n", i,
priv->EEPROMTxPowerLevelCCK[i]);
RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index"
" %d = 0x%02x\n", i+1,
priv->EEPROMTxPowerLevelCCK[i+1]);
RT_TRACE(COMP_INIT,
"CCK Tx Power Level, Index %d = 0x%02x\n",
i, priv->EEPROMTxPowerLevelCCK[i]);
RT_TRACE(COMP_INIT,
"CCK Tx Power Level, Index %d = 0x%02x\n",
i+1, priv->EEPROMTxPowerLevelCCK[i+1]);
}
for (i = 0; i < 14; i += 2) {
if (!priv->AutoloadFailFlag)
......@@ -464,11 +465,12 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
usValue = EEPROM_Default_TxPower;
*((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i]))
= usValue;
RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level,"
" Index %d = 0x%02x\n", i,
priv->EEPROMTxPowerLevelOFDM24G[i]);
RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level,"
" Index %d = 0x%02x\n", i + 1,
RT_TRACE(COMP_INIT,
"OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n",
i, priv->EEPROMTxPowerLevelOFDM24G[i]);
RT_TRACE(COMP_INIT,
"OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n",
i + 1,
priv->EEPROMTxPowerLevelOFDM24G[i+1]);
}
}
......@@ -525,21 +527,21 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
priv->EEPROMRfCOfdmChnlTxPwLevel[2];
}
for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_A"
"[%d] = 0x%x\n", i,
priv->TxPowerLevelCCK_A[i]);
RT_TRACE(COMP_INIT,
"priv->TxPowerLevelCCK_A[%d] = 0x%x\n",
i, priv->TxPowerLevelCCK_A[i]);
for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM"
"24G_A[%d] = 0x%x\n", i,
priv->TxPowerLevelOFDM24G_A[i]);
RT_TRACE(COMP_INIT,
"priv->TxPowerLevelOFDM24G_A[%d] = 0x%x\n",
i, priv->TxPowerLevelOFDM24G_A[i]);
for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_C"
"[%d] = 0x%x\n", i,
priv->TxPowerLevelCCK_C[i]);
RT_TRACE(COMP_INIT,
"priv->TxPowerLevelCCK_C[%d] = 0x%x\n",
i, priv->TxPowerLevelCCK_C[i]);
for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM"
"24G_C[%d] = 0x%x\n", i,
priv->TxPowerLevelOFDM24G_C[i]);
RT_TRACE(COMP_INIT,
"priv->TxPowerLevelOFDM24G_C[%d] = 0x%x\n",
i, priv->TxPowerLevelOFDM24G_C[i]);
priv->LegacyHTTxPowerDiff =
priv->EEPROMLegacyHTTxPowerDiff;
priv->AntennaTxPwDiff[0] = 0;
......@@ -735,8 +737,9 @@ bool rtl8192_adapter_start(struct net_device *dev)
else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)
ulRegRead |= CPU_GEN_FIRMWARE_RESET;
else
RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)"
"\n", __func__, priv->pFirmware->firmware_status);
RT_TRACE(COMP_ERR,
"ERROR in %s(): undefined firmware state(%d)\n",
__func__, priv->pFirmware->firmware_status);
write_nic_dword(dev, CPU_GEN, ulRegRead);
......@@ -766,8 +769,8 @@ bool rtl8192_adapter_start(struct net_device *dev)
else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK)
ulRegRead |= CPU_CCK_LOOPBACK;
else
RT_TRACE(COMP_ERR, "Serious error: wrong loopback"
" mode setting\n");
RT_TRACE(COMP_ERR,
"Serious error: wrong loopback mode setting\n");
write_nic_dword(dev, CPU_GEN, ulRegRead);
......@@ -883,15 +886,15 @@ bool rtl8192_adapter_start(struct net_device *dev)
__func__);
MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW, true);
} else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) {
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for"
" RfOffReason(%d) ----------\n", __func__,
priv->rtllib->RfOffReason);
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER),
"%s(): Turn off RF for RfOffReason(%d) ----------\n",
__func__, priv->rtllib->RfOffReason);
MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
true);
} else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) {
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for"
" RfOffReason(%d) ----------\n", __func__,
priv->rtllib->RfOffReason);
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER),
"%s(): Turn off RF for RfOffReason(%d) ----------\n",
__func__, priv->rtllib->RfOffReason);
MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
true);
} else {
......@@ -939,17 +942,17 @@ bool rtl8192_adapter_start(struct net_device *dev)
priv->CCKPresentAttentuation_difference = 0;
priv->CCKPresentAttentuation =
priv->CCKPresentAttentuation_20Mdefault;
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpower"
"trackingindex_initial = %d\n",
RT_TRACE(COMP_POWER_TRACKING,
"priv->rfa_txpowertrackingindex_initial = %d\n",
priv->rfa_txpowertrackingindex);
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpower"
"trackingindex_real__initial = %d\n",
RT_TRACE(COMP_POWER_TRACKING,
"priv->rfa_txpowertrackingindex_real__initial = %d\n",
priv->rfa_txpowertrackingindex_real);
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresent"
"Attentuation_difference_initial = %d\n",
RT_TRACE(COMP_POWER_TRACKING,
"priv->CCKPresentAttentuation_difference_initial = %d\n",
priv->CCKPresentAttentuation_difference);
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresent"
"Attentuation_initial = %d\n",
RT_TRACE(COMP_POWER_TRACKING,
"priv->CCKPresentAttentuation_initial = %d\n",
priv->CCKPresentAttentuation);
priv->btxpower_tracking = false;
}
......@@ -1169,8 +1172,9 @@ static u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)
QueueSelect = QSLT_HIGH;
break;
default:
RT_TRACE(COMP_ERR, "TransmitTCB(): Impossible Queue Selection:"
" %d\n", QueueID);
RT_TRACE(COMP_ERR,
"TransmitTCB(): Impossible Queue Selection: %d\n",
QueueID);
break;
}
return QueueSelect;
......@@ -1361,9 +1365,10 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)
break;
default:
RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported"
"Rate [%x], bIsHT = %d!!!\n", rate, bIsHT);
break;
RT_TRACE(COMP_RECV,
"HwRateToMRate90(): Non supportedRate [%x], bIsHT = %d!!!\n",
rate, bIsHT);
break;
}
} else {
......@@ -1421,8 +1426,9 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)
break;
default:
RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported "
"Rate [%x], bIsHT = %d!!!\n", rate, bIsHT);
RT_TRACE(COMP_RECV,
"HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n",
rate, bIsHT);
break;
}
}
......@@ -1737,8 +1743,8 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev,
rfpath))
continue;
RT_TRACE(COMP_DBG, "Jacken -> pPreviousstats->RxMIMO"
"SignalStrength[rfpath] = %d\n",
RT_TRACE(COMP_DBG,
"Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath] = %d\n",
prev_st->RxMIMOSignalStrength[rfpath]);
if (priv->stats.rx_rssi_percentage[rfpath] == 0) {
priv->stats.rx_rssi_percentage[rfpath] =
......@@ -1761,8 +1767,8 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
(prev_st->RxMIMOSignalStrength[rfpath])) /
(RX_SMOOTH);
}
RT_TRACE(COMP_DBG, "Jacken -> priv->RxStats.RxRSSI"
"Percentage[rfPath] = %d\n",
RT_TRACE(COMP_DBG,
"Jacken -> priv->RxStats.RxRSSIPercentage[rfPath] = %d\n",
priv->stats.rx_rssi_percentage[rfpath]);
}
}
......@@ -2073,8 +2079,8 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev,
pDrvInfo);
if (pDrvInfo->FirstAGGR == 1 || pDrvInfo->PartAggr == 1)
RT_TRACE(COMP_RXDESC, "pDrvInfo->FirstAGGR = %d,"
" pDrvInfo->PartAggr = %d\n",
RT_TRACE(COMP_RXDESC,
"pDrvInfo->FirstAGGR = %d, pDrvInfo->PartAggr = %d\n",
pDrvInfo->FirstAGGR, pDrvInfo->PartAggr);
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,
if (!priv->rtllib->check_nic_enough_desc(dev, tcb_desc->queue_index) ||
(!skb_queue_empty(&priv->rtllib->skb_waitQ[tcb_desc->queue_index])) ||
(priv->rtllib->queue_stop)) {
RT_TRACE(COMP_FIRMWARE, "===================> tx "
"full!\n");
RT_TRACE(COMP_FIRMWARE,
"===================> tx full!\n");
skb_queue_tail(&priv->rtllib->skb_waitQ
[tcb_desc->queue_index], skb);
} else {
......@@ -196,8 +196,8 @@ static bool firmware_check_ready(struct net_device *dev,
if (rt_status)
pfirmware->firmware_status = FW_STATUS_3_TURNON_CPU;
else
RT_TRACE(COMP_FIRMWARE, "CPUcheck_maincodeok_turnon"
"CPU fail!\n");
RT_TRACE(COMP_FIRMWARE,
"CPUcheck_maincodeok_turnonCPU fail!\n");
break;
......@@ -209,8 +209,9 @@ static bool firmware_check_ready(struct net_device *dev,
if (rt_status)
pfirmware->firmware_status = FW_STATUS_5_READY;
else
RT_TRACE(COMP_FIRMWARE, "CPUcheck_firmware_ready fail"
"(%d)!\n", rt_status);
RT_TRACE(COMP_FIRMWARE,
"CPUcheck_firmware_ready fail(%d)!\n",
rt_status);
break;
default:
......@@ -245,8 +246,8 @@ bool init_firmware(struct net_device *dev)
rst_opt = OPT_FIRMWARE_RESET;
starting_state = FW_INIT_STEP2_DATA;
} else {
RT_TRACE(COMP_FIRMWARE, "PlatformInitFirmware: undefined"
" firmware state\n");
RT_TRACE(COMP_FIRMWARE,
"PlatformInitFirmware: undefined firmware state\n");
}
for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA;
......@@ -265,14 +266,14 @@ bool init_firmware(struct net_device *dev)
fw_name[init_step],
&priv->pdev->dev);
if (rc < 0) {
RT_TRACE(COMP_FIRMWARE, "request firmware fail!\n");
RT_TRACE(COMP_FIRMWARE,
"request firmware fail!\n");
goto download_firmware_fail;
}
if (fw_entry->size >
sizeof(pfirmware->firmware_buf[init_step])) {
RT_TRACE(COMP_FIRMWARE, "img file size "
"exceed the container struct "
"buffer fail!\n");
RT_TRACE(COMP_FIRMWARE,
"img file size exceed the container struct buffer fail!\n");
goto download_firmware_fail;
}
......
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,
struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device *ieee = priv->rtllib;
RT_TRACE(COMP_DBG, "===========>%s():EntryNo is %d,KeyIndex is "
"%d,KeyType is %d,is_mesh is %d\n", __func__, EntryNo,
KeyIndex, KeyType, is_mesh);
RT_TRACE(COMP_DBG,
"===========>%s():EntryNo is %d,KeyIndex is %d,KeyType is %d,is_mesh is %d\n",
__func__, EntryNo, KeyIndex, KeyType, is_mesh);
if (!is_mesh) {
ieee->swcamtable[EntryNo].bused = true;
ieee->swcamtable[EntryNo].key_index = KeyIndex;
......@@ -127,9 +127,9 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
if (EntryNo >= TOTAL_CAM_ENTRY)
RT_TRACE(COMP_ERR, "cam entry exceeds in setKey()\n");
RT_TRACE(COMP_SEC, "====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d,"
"KeyType:%d, MacAddr %pM\n", dev, EntryNo, KeyIndex,
KeyType, MacAddr);
RT_TRACE(COMP_SEC,
"====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d,KeyType:%d, MacAddr %pM\n",
dev, EntryNo, KeyIndex, KeyType, MacAddr);
if (DefaultKey)
usConfig |= BIT15 | (KeyType<<2);
......@@ -244,8 +244,8 @@ void CamRestoreAllEntry(struct net_device *dev)
(u32 *)(&priv->rtllib->swcamtable[0].key_buf[0])
);
} else {
RT_TRACE(COMP_ERR, "===>%s():ERR!! ADHOC TKIP "
",but 0 entry is have no data\n",
RT_TRACE(COMP_ERR,
"===>%s():ERR!! ADHOC TKIP ,but 0 entry is have no data\n",
__func__);
return;
}
......@@ -268,8 +268,8 @@ void CamRestoreAllEntry(struct net_device *dev)
CAM_CONST_ADDR[0], 0,
(u32 *)(&priv->rtllib->swcamtable[0].key_buf[0]));
} else {
RT_TRACE(COMP_ERR, "===>%s():ERR!! ADHOC CCMP ,"
"but 0 entry is have no data\n",
RT_TRACE(COMP_ERR,
"===>%s():ERR!! ADHOC CCMP ,but 0 entry is have no data\n",
__func__);
return;
}
......
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file @ 0822339b
......@@ -757,8 +757,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
for (i = 0; i < CCK_Table_length; i++) {
if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
priv->CCK_index = (u8) i;
RT_TRACE(COMP_POWER_TRACKING, "Initial reg0x%x"
" = 0x%x, CCK_index = 0x%x\n",
RT_TRACE(COMP_POWER_TRACKING,
"Initial reg0x%x = 0x%x, CCK_index = 0x%x\n",
rCCK0_TxFilter1, TempCCk,
priv->CCK_index);
break;
......@@ -803,8 +803,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
priv->Record_CCK_20Mindex = tmpCCK20Mindex;
priv->Record_CCK_40Mindex = tmpCCK40Mindex;
RT_TRACE(COMP_POWER_TRACKING, "Record_CCK_20Mindex / Record_CCK_40"
"Mindex = %d / %d.\n",
RT_TRACE(COMP_POWER_TRACKING,
"Record_CCK_20Mindex / Record_CCK_40Mindex = %d / %d.\n",
priv->Record_CCK_20Mindex, priv->Record_CCK_40Mindex);
if (priv->rtllib->current_network.channel == 14 &&
......@@ -2131,8 +2131,8 @@ static void dm_check_edca_turbo(struct net_device *dev)
static int wb_tmp;
if (wb_tmp == 0) {
printk(KERN_INFO "%s():iot peer is %s, bssid:"
" %pM\n", __func__,
printk(KERN_INFO
"%s():iot peer is %s, bssid: %pM\n", __func__,
peername[pHTInfo->IOTPeer],
priv->rtllib->current_network.bssid);
wb_tmp = 1;
......@@ -2638,9 +2638,10 @@ void dm_fsync_timer_callback(unsigned long data)
}
priv->rate_record = rate_count;
priv->rateCountDiffRecord = rate_count_diff;
RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rate"
"Countdiff %d bSwitchFsync %d\n", priv->rate_record,
rate_count, rate_count_diff, priv->bswitch_fsync);
RT_TRACE(COMP_HALDM,
"rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n",
priv->rate_record, rate_count, rate_count_diff,
priv->bswitch_fsync);
if (priv->undecorated_smoothed_pwdb >
priv->rtllib->fsync_rssi_threshold &&
bSwitchFromCountDiff) {
......@@ -2685,9 +2686,10 @@ void dm_fsync_timer_callback(unsigned long data)
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);
}
RT_TRACE(COMP_HALDM, "ContinueDiffCount %d\n", priv->ContinueDiffCount);
RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d "
"bSwitchFsync %d\n", priv->rate_record, rate_count,
rate_count_diff, priv->bswitch_fsync);
RT_TRACE(COMP_HALDM,
"rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n",
priv->rate_record, rate_count, rate_count_diff,
priv->bswitch_fsync);
}
static void dm_StartHWFsync(struct net_device *dev)
......@@ -2778,12 +2780,14 @@ void dm_check_fsync(struct net_device *dev)
static u8 reg_c38_State = RegC38_Default;
static u32 reset_cnt;
RT_TRACE(COMP_HALDM, "RSSI %d TimeInterval %d MultipleTimeInterval "
"%d\n", priv->rtllib->fsync_rssi_threshold,
RT_TRACE(COMP_HALDM,
"RSSI %d TimeInterval %d MultipleTimeInterval %d\n",
priv->rtllib->fsync_rssi_threshold,
priv->rtllib->fsync_time_interval,
priv->rtllib->fsync_multiple_timeinterval);
RT_TRACE(COMP_HALDM, "RateBitmap 0x%x FirstDiffRateThreshold %d Second"
"DiffRateThreshold %d\n", priv->rtllib->fsync_rate_bitmap,
RT_TRACE(COMP_HALDM,
"RateBitmap 0x%x FirstDiffRateThreshold %d SecondDiffRateThreshold %d\n",
priv->rtllib->fsync_rate_bitmap,
priv->rtllib->fsync_firstdiff_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)
if (DeviceID == 0x8172) {
switch (RevisionID) {
case HAL_HW_PCI_REVISION_ID_8192PCIE:
printk(KERN_INFO "Adapter(8192 PCI-E) is found - "
"DeviceID=%x\n", DeviceID);
printk(KERN_INFO
"Adapter(8192 PCI-E) is found - DeviceID=%x\n",
DeviceID);
priv->card_8192 = NIC_8192E;
break;
case HAL_HW_PCI_REVISION_ID_8192SE:
printk(KERN_INFO "Adapter(8192SE) is found - "
"DeviceID=%x\n", DeviceID);
printk(KERN_INFO
"Adapter(8192SE) is found - DeviceID=%x\n",
DeviceID);
priv->card_8192 = NIC_8192SE;
break;
default:
......@@ -83,9 +85,11 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev)
}
if (priv->ops->nic_type != priv->card_8192) {
printk(KERN_INFO "Detect info(%x) and hardware info(%x) not match!\n",
priv->ops->nic_type, priv->card_8192);
printk(KERN_INFO "Please select proper driver before install!!!!\n");
printk(KERN_INFO
"Detect info(%x) and hardware info(%x) not match!\n",
priv->ops->nic_type, priv->card_8192);
printk(KERN_INFO
"Please select proper driver before install!!!!\n");
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)
priv->polling_timer_on = 0;
if (!netif_running(dev)) {
printk(KERN_INFO "RTL819XE:UI is open out of suspend "
"function\n");
printk(KERN_INFO
"RTL819XE:UI is open out of suspend function\n");
goto out_pci_suspend;
}
......@@ -59,8 +59,8 @@ int rtl8192E_suspend(struct pci_dev *pdev, pm_message_t state)
out_pci_suspend:
printk("r8192E support WOL call??????????????????????\n");
if (priv->rtllib->bSupportRemoteWakeUp)
RT_TRACE(COMP_POWER, "r8192E support WOL call!!!!!!!"
"!!!!!!!!!!!.\n");
RT_TRACE(COMP_POWER,
"r8192E support WOL call!!!!!!!!!!!!!!!!!!.\n");
pci_save_state(pdev);
pci_disable_device(pdev);
pci_enable_wake(pdev, pci_choose_state(pdev, state),
......@@ -101,8 +101,8 @@ int rtl8192E_resume(struct pci_dev *pdev)
check_rfctrl_gpio_timer((unsigned long)dev);
if (!netif_running(dev)) {
printk(KERN_INFO "RTL819XE:UI is open out of resume "
"function\n");
printk(KERN_INFO
"RTL819XE:UI is open out of resume function\n");
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)
spin_lock_irqsave(&priv->rf_ps_lock, flags);
if (priv->RFChangeInProgress) {
spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
RT_TRACE(COMP_DBG, "rtl8192_hw_sleep_down(): RF Change in "
"progress!\n");
RT_TRACE(COMP_DBG,
"rtl8192_hw_sleep_down(): RF Change in progress!\n");
return;
}
spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
......@@ -64,8 +64,8 @@ void rtl8192_hw_wakeup(struct net_device *dev)
spin_lock_irqsave(&priv->rf_ps_lock, flags);
if (priv->RFChangeInProgress) {
spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
RT_TRACE(COMP_DBG, "rtl8192_hw_wakeup(): RF Change in "
"progress!\n");
RT_TRACE(COMP_DBG,
"rtl8192_hw_wakeup(): RF Change in progress!\n");
queue_delayed_work_rsl(priv->rtllib->wq,
&priv->rtllib->hw_wakeup_wq,
msecs_to_jiffies(10));
......@@ -240,8 +240,8 @@ static bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev,
priv->rtllib->sta_sleep = LPS_IS_WAKE;
spin_lock_irqsave(&(priv->rtllib->mgmt_tx_lock), flags);
RT_TRACE(COMP_DBG, "LPS leave: notify AP we are awaked"
" ++++++++++ SendNullFunctionData\n");
RT_TRACE(COMP_DBG,
"LPS leave: notify AP we are awaked ++++++++++ SendNullFunctionData\n");
rtllib_sta_ps_send_null_frame(priv->rtllib, 0);
spin_unlock_irqrestore(&(priv->rtllib->mgmt_tx_lock), flags);
}
......@@ -256,8 +256,8 @@ void LeisurePSEnter(struct net_device *dev)
&(priv->rtllib->PowerSaveControl);
RT_TRACE(COMP_PS, "LeisurePSEnter()...\n");
RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdle"
"Count is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n",
RT_TRACE(COMP_PS,
"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,
RT_CHECK_FOR_HANG_PERIOD);
......@@ -272,8 +272,8 @@ void LeisurePSEnter(struct net_device *dev)
if (priv->rtllib->ps == RTLLIB_PS_DISABLED) {
RT_TRACE(COMP_LPS, "LeisurePSEnter(): Enter "
"802.11 power save mode...\n");
RT_TRACE(COMP_LPS,
"LeisurePSEnter(): Enter 802.11 power save mode...\n");
if (!pPSC->bFwCtrlLPS) {
if (priv->rtllib->SetFwCmdHandler)
......@@ -302,8 +302,8 @@ void LeisurePSLeave(struct net_device *dev)
if (pPSC->bLeisurePs) {
if (priv->rtllib->ps != RTLLIB_PS_DISABLED) {
RT_TRACE(COMP_LPS, "LeisurePSLeave(): Busy Traffic , "
"Leave 802.11 power save..\n");
RT_TRACE(COMP_LPS,
"LeisurePSLeave(): Busy Traffic , Leave 802.11 power save..\n");
MgntActSet_802_11_PowerSaveMode(dev,
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,
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff) {
RT_TRACE(COMP_ERR, "%s():Hw is Radio Off, we can't set "
"Power,return\n", __func__);
RT_TRACE(COMP_ERR,
"%s():Hw is Radio Off, we can't set Power,return\n",
__func__);
return 0;
}
down(&priv->wx_sem);
......@@ -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);
if ((*extra != 0) && (*extra != 1)) {
RT_TRACE(COMP_ERR, "%s(): set radio an err value,must 0(radio "
"off) or 1(radio on)\n", __func__);
RT_TRACE(COMP_ERR,
"%s(): set radio an err value,must 0(radio off) or 1(radio on)\n",
__func__);
up(&priv->wx_sem);
return -1;
}
......@@ -293,8 +295,9 @@ static int r8192se_wx_set_force_lps(struct net_device *dev,
down(&priv->wx_sem);
printk(KERN_INFO "%s(): force LPS ! extra is %d (1 is open 0 is "
"close)\n", __func__, *extra);
printk(KERN_INFO
"%s(): force LPS ! extra is %d (1 is open 0 is close)\n",
__func__, *extra);
priv->force_lps = *extra;
up(&priv->wx_sem);
return 0;
......@@ -344,8 +347,9 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
up(&priv->wx_sem);
return -1;
} else {
printk(KERN_INFO "=========>%s(): "
"IPSLeave\n", __func__);
printk(KERN_INFO
"=========>%s(): IPSLeave\n",
__func__);
down(&priv->rtllib->ips_sem);
IPSLeave(dev);
up(&priv->rtllib->ips_sem);
......@@ -500,13 +504,15 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
if (rtState == eRfOff) {
if (priv->rtllib->RfOffReason >
RF_CHANGE_BY_IPS) {
RT_TRACE(COMP_ERR, "%s(): RF is "
"OFF.\n", __func__);
RT_TRACE(COMP_ERR,
"%s(): RF is OFF.\n",
__func__);
up(&priv->wx_sem);
return -1;
} else {
RT_TRACE(COMP_PS, "=========>%s(): "
"IPSLeave\n", __func__);
RT_TRACE(COMP_PS,
"=========>%s(): IPSLeave\n",
__func__);
down(&priv->rtllib->ips_sem);
IPSLeave(dev);
up(&priv->rtllib->ips_sem);
......@@ -573,8 +579,9 @@ static int r8192_wx_set_essid(struct net_device *dev,
int ret;
if (priv->bHwRadioOff) {
printk(KERN_INFO "=========>%s():hw radio off,or Rf state is "
"eRfOff, return\n", __func__);
printk(KERN_INFO
"=========>%s():hw radio off,or Rf state is eRfOff, return\n",
__func__);
return 0;
}
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,
u8 *tag = NULL;
u16 len = ieee->tx_headroom + 9;
RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, "========>%s(), frame(%d)"
" sentd to: %pM, ieee->dev:%p\n", __func__,
type, Dst, ieee->dev);
RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA,
"========>%s(), frame(%d) sentd to: %pM, ieee->dev:%p\n",
__func__, type, Dst, ieee->dev);
if (pBA == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "pBA is NULL\n");
return NULL;
......@@ -148,9 +148,8 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,
if (net_ratelimit())
RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA,
"========>%s(), Reason"
"Code(%d) sentd to: %pM\n", __func__,
ReasonCode, dst);
"========>%s(), ReasonCode(%d) sentd to: %pM\n",
__func__, ReasonCode, dst);
memset(&DelbaParamSet, 0, 2);
......@@ -203,8 +202,8 @@ static void rtllib_send_ADDBAReq(struct rtllib_device *ieee, u8 *dst,
RT_TRACE(COMP_DBG, "====>to send ADDBAREQ!!!!!\n");
softmac_mgmt_xmit(skb, ieee);
} else {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function"
" %s()\n", __func__);
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"alloc skb error in function %s()\n", __func__);
}
}
......@@ -217,8 +216,8 @@ static void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst,
if (skb)
softmac_mgmt_xmit(skb, ieee);
else
RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function"
" %s()\n", __func__);
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"alloc skb error in function %s()\n", __func__);
}
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)
softmac_mgmt_xmit(skb, ieee);
else
RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function"
" %s()\n", __func__);
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"alloc skb error in function %s()\n", __func__);
}
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;
if (skb->len < sizeof(struct rtllib_hdr_3addr) + 9) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in BAREQ(%d / "
"%d)\n", (int)skb->len,
RTLLIB_DEBUG(RTLLIB_DL_ERR,
" Invalid skb len in BAREQ(%d / %d)\n",
(int)skb->len,
(int)(sizeof(struct rtllib_hdr_3addr) + 9));
return -1;
}
......@@ -269,8 +269,8 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
(ieee->pHTInfo->bCurrentHTSupport == false) ||
(ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) {
rc = ADDBA_STATUS_REFUSED;
RTLLIB_DEBUG(RTLLIB_DL_ERR, "Failed to reply on ADDBA_REQ as "
"some capability is not ready(%d, %d)\n",
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"Failed to reply on ADDBA_REQ as some capability is not ready(%d, %d)\n",
ieee->current_network.qos_data.active,
ieee->pHTInfo->bCurrentHTSupport);
goto OnADDBAReq_Fail;
......@@ -285,8 +285,8 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) {
rc = ADDBA_STATUS_INVALID_PARAM;
RTLLIB_DEBUG(RTLLIB_DL_ERR, "BA Policy is not correct in "
"%s()\n", __func__);
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"BA Policy is not correct in %s()\n", __func__);
goto OnADDBAReq_Fail;
}
......@@ -333,8 +333,9 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
u16 ReasonCode;
if (skb->len < sizeof(struct rtllib_hdr_3addr) + 9) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in BARSP(%d / "
"%d)\n", (int)skb->len,
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"Invalid skb len in BARSP(%d / %d)\n",
(int)skb->len,
(int)(sizeof(struct rtllib_hdr_3addr) + 9));
return -1;
}
......@@ -351,8 +352,8 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
if (ieee->current_network.qos_data.active == 0 ||
ieee->pHTInfo->bCurrentHTSupport == false ||
ieee->pHTInfo->bCurrentAMPDUEnable == false) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "reject to ADDBA_RSP as some capab"
"ility is not ready(%d, %d, %d)\n",
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",
ieee->current_network.qos_data.active,
ieee->pHTInfo->bCurrentHTSupport,
ieee->pHTInfo->bCurrentAMPDUEnable);
......@@ -374,18 +375,19 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
if (pAdmittedBA->bValid == true) {
RTLLIB_DEBUG(RTLLIB_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp."
" Drop because already admit it!\n");
RTLLIB_DEBUG(RTLLIB_DL_BA,
"OnADDBARsp(): Recv ADDBA Rsp. Drop because already admit it!\n");
return -1;
} else if ((pPendingBA->bValid == false) ||
(*pDialogToken != pPendingBA->DialogToken)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "OnADDBARsp(): Recv ADDBA Rsp. "
"BA invalid, DELBA!\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"OnADDBARsp(): Recv ADDBA Rsp. BA invalid, DELBA!\n");
ReasonCode = DELBA_REASON_UNKNOWN_BA;
goto OnADDBARsp_Reject;
} else {
RTLLIB_DEBUG(RTLLIB_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp. BA "
"is admitted! Status code:%X\n", *pStatusCode);
RTLLIB_DEBUG(RTLLIB_DL_BA,
"OnADDBARsp(): Recv ADDBA Rsp. BA is admitted! Status code:%X\n",
*pStatusCode);
DeActivateBAEntry(ieee, pPendingBA);
}
......@@ -432,16 +434,17 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
u8 *dst = NULL;
if (skb->len < sizeof(struct rtllib_hdr_3addr) + 6) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in DELBA(%d /"
" %d)\n", (int)skb->len,
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"Invalid skb len in DELBA(%d / %d)\n",
(int)skb->len,
(int)(sizeof(struct rtllib_hdr_3addr) + 6));
return -1;
}
if (ieee->current_network.qos_data.active == 0 ||
ieee->pHTInfo->bCurrentHTSupport == false) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "received DELBA while QOS or HT "
"is not supported(%d, %d)\n",
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"received DELBA while QOS or HT is not supported(%d, %d)\n",
ieee->current_network. qos_data.active,
ieee->pHTInfo->bCurrentHTSupport);
return -1;
......@@ -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,
(u8)pDelBaParamSet->field.TID, RX_DIR, false)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't get TS for RXTS in "
"%s().dst: %pM TID:%d\n", __func__, dst,
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"can't get TS for RXTS in %s().dst: %pM TID:%d\n",
__func__, dst,
(u8)pDelBaParamSet->field.TID);
return -1;
}
......@@ -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,
(u8)pDelBaParamSet->field.TID, TX_DIR, false)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't get TS for TXTS in "
"%s()\n", __func__);
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"can't get TS for TXTS in %s()\n",
__func__);
return -1;
}
......
drivers/staging/rtl8192e/rtl819x_HTProc.c
View file @ 0822339b
......@@ -294,8 +294,8 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,
struct ht_capab_ele *pCapELE = NULL;
if ((posHTCap == NULL) || (pHT == NULL)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "posHTCap or pHTInfo can't be "
"null in HTConstructCapabilityElement()\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"posHTCap or pHTInfo can't be null in HTConstructCapabilityElement()\n");
return;
}
memset(posHTCap, 0, *len);
......@@ -331,9 +331,9 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,
pCapELE->LSigTxopProtect = 0;
RTLLIB_DEBUG(RTLLIB_DL_HT, "TX HT cap/info ele BW=%d MaxAMSDUSize:%d "
"DssCCk:%d\n", pCapELE->ChlWidth, pCapELE->MaxAMSDUSize,
pCapELE->DssCCk);
RTLLIB_DEBUG(RTLLIB_DL_HT,
"TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
pCapELE->ChlWidth, pCapELE->MaxAMSDUSize, pCapELE->DssCCk);
if (IsEncrypt) {
pCapELE->MPDUDensity = 7;
......@@ -376,8 +376,8 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo,
struct ht_info_ele *pHTInfoEle = (struct ht_info_ele *)posHTInfo;
if ((posHTInfo == NULL) || (pHTInfoEle == NULL)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "posHTInfo or pHTInfoEle can't be "
"null in HTConstructInfoElement()\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"posHTInfo or pHTInfoEle can't be null in HTConstructInfoElement()\n");
return;
}
......@@ -416,8 +416,8 @@ void HTConstructRT2RTAggElement(struct rtllib_device *ieee, u8 *posRT2RTAgg,
u8 *len)
{
if (posRT2RTAgg == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "posRT2RTAgg can't be null in "
"HTConstructRT2RTAggElement()\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"posRT2RTAgg can't be null in HTConstructRT2RTAggElement()\n");
return;
}
memset(posRT2RTAgg, 0, *len);
......@@ -440,8 +440,8 @@ static u8 HT_PickMCSRate(struct rtllib_device *ieee, u8 *pOperateMCS)
u8 i;
if (pOperateMCS == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "pOperateMCS can't be null"
" in HT_PickMCSRate()\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"pOperateMCS can't be null in HT_PickMCSRate()\n");
return false;
}
......@@ -475,8 +475,8 @@ u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet,
u8 availableMcsRate[16];
if (pMCSRateSet == NULL || pMCSFilter == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "pMCSRateSet or pMCSFilter can't "
"be null in HTGetHighestMCSRate()\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"pMCSRateSet or pMCSFilter can't be null in HTGetHighestMCSRate()\n");
return false;
}
for (i = 0; i < 16; i++)
......@@ -541,8 +541,8 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34};
if (pHTInfo->bCurrentHTSupport == false) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "<=== HTOnAssocRsp(): "
"HT_DISABLE\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"<=== HTOnAssocRsp(): HT_DISABLE\n");
return;
}
RTLLIB_DEBUG(RTLLIB_DL_HT, "===> HTOnAssocRsp_wq(): HT_ENABLE\n");
......@@ -843,8 +843,8 @@ u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame)
{
if (ieee->pHTInfo->bCurrentHTSupport) {
if ((IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) == 1) {
RTLLIB_DEBUG(RTLLIB_DL_HT, "HT CONTROL FILED "
"EXIST!!\n");
RTLLIB_DEBUG(RTLLIB_DL_HT,
"HT CONTROL FILED EXIST!!\n");
return true;
}
}
......
drivers/staging/rtl8192e/rtl819x_TSProc.c
View file @ 0822339b
......@@ -58,9 +58,9 @@ static void RxPktPendingTimeout(unsigned long data)
pRxTs->RxIndicateSeq =
(pRxTs->RxIndicateSeq + 1) % 4096;
RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Indicate"
" SeqNum: %d\n", __func__,
pReorderEntry->SeqNum);
RTLLIB_DEBUG(RTLLIB_DL_REORDER,
"%s(): Indicate SeqNum: %d\n",
__func__, pReorderEntry->SeqNum);
ieee->stats_IndicateArray[index] =
pReorderEntry->prxb;
index++;
......@@ -78,8 +78,8 @@ static void RxPktPendingTimeout(unsigned long data)
pRxTs->RxTimeoutIndicateSeq = 0xffff;
if (index > REORDER_WIN_SIZE) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket():"
" Rx Reorder struct buffer full!!\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"RxReorderIndicatePacket(): Rx Reorder struct buffer full!!\n");
spin_unlock_irqrestore(&(ieee->reorder_spinlock),
flags);
return;
......@@ -104,8 +104,8 @@ static void TsAddBaProcess(unsigned long data)
TxTsRecord[num]);
TsInitAddBA(ieee, pTxTs, BA_POLICY_IMMEDIATE, false);
RTLLIB_DEBUG(RTLLIB_DL_BA, "TsAddBaProcess(): ADDBA Req is "
"started!!\n");
RTLLIB_DEBUG(RTLLIB_DL_BA,
"TsAddBaProcess(): ADDBA Req is started!!\n");
}
static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
......@@ -313,16 +313,17 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
u8 UP = 0;
if (is_multicast_ether_addr(Addr)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR! get TS for Broadcast or "
"Multicast\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"ERR! get TS for Broadcast or Multicast\n");
return false;
}
if (ieee->current_network.qos_data.supported == 0) {
UP = 0;
} else {
if (!IsACValid(TID)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR! in %s(), TID(%d) is "
"not valid\n", __func__, TID);
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"ERR! in %s(), TID(%d) is not valid\n",
__func__, TID);
return false;
}
......@@ -351,8 +352,8 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
return true;
} else {
if (!bAddNewTs) {
RTLLIB_DEBUG(RTLLIB_DL_TS, "add new TS failed"
"(tid:%d)\n", UP);
RTLLIB_DEBUG(RTLLIB_DL_TS,
"add new TS failed(tid:%d)\n", UP);
return false;
} else {
union tspec_body TSpec;
......@@ -390,10 +391,9 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
ResetRxTsEntry(tmp);
}
RTLLIB_DEBUG(RTLLIB_DL_TS, "to init current TS"
", UP:%d, Dir:%d, addr: %pM"
" ppTs=%p\n", UP, Dir,
Addr, *ppTS);
RTLLIB_DEBUG(RTLLIB_DL_TS,
"to init current TS, UP:%d, Dir:%d, addr: %pM ppTs=%p\n",
UP, Dir, Addr, *ppTS);
pTSInfo->field.ucTrafficType = 0;
pTSInfo->field.ucTSID = UP;
pTSInfo->field.ucDirection = Dir;
......@@ -410,10 +410,9 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
return true;
} else {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR!!in function "
"%s() There is not enough dir=%d"
"(0=up down=1) TS record to be "
"used!!", __func__, Dir);
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"ERR!!in function %s() There is not enough dir=%d(0=up down=1) TS record to be used!!",
__func__, Dir);
return false;
}
}
......@@ -438,8 +437,8 @@ static void RemoveTsEntry(struct rtllib_device *ieee, struct ts_common_info *pTs
pRxReorderEntry = (struct rx_reorder_entry *)
list_entry(pRxTS->RxPendingPktList.prev,
struct rx_reorder_entry, List);
RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Delete SeqNum "
"%d!\n", __func__,
RTLLIB_DEBUG(RTLLIB_DL_REORDER,
"%s(): Delete SeqNum %d!\n", __func__,
pRxReorderEntry->SeqNum);
list_del_init(&pRxReorderEntry->List);
{
......@@ -539,13 +538,13 @@ void TsStartAddBaProcess(struct rtllib_device *ieee, struct tx_ts_record *pTxTS)
pTxTS->bAddBaReqInProgress = true;
if (pTxTS->bAddBaReqDelayed) {
RTLLIB_DEBUG(RTLLIB_DL_BA, "TsStartAddBaProcess(): "
"Delayed Start ADDBA after 60 sec!!\n");
RTLLIB_DEBUG(RTLLIB_DL_BA,
"TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n");
mod_timer(&pTxTS->TsAddBaTimer, jiffies +
msecs_to_jiffies(TS_ADDBA_DELAY));
} else {
RTLLIB_DEBUG(RTLLIB_DL_BA, "TsStartAddBaProcess(): "
"Immediately Start ADDBA now!!\n");
RTLLIB_DEBUG(RTLLIB_DL_BA,
"TsStartAddBaProcess(): Immediately Start ADDBA now!!\n");
mod_timer(&pTxTS->TsAddBaTimer, jiffies+10);
}
} else
......
drivers/staging/rtl8192e/rtllib_crypt.c
View file @ 0822339b
......@@ -62,8 +62,9 @@ void rtllib_crypt_deinit_handler(unsigned long data)
spin_lock_irqsave(info->lock, flags);
rtllib_crypt_deinit_entries(info, 0);
if (!list_empty(&info->crypt_deinit_list)) {
printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
"deletion list\n", info->name);
printk(KERN_DEBUG
"%s: entries remaining in delayed crypt deletion list\n",
info->name);
info->crypt_deinit_timer.expires = jiffies + HZ;
add_timer(&info->crypt_deinit_timer);
}
......@@ -145,8 +146,8 @@ int rtllib_unregister_crypto_ops(struct lib80211_crypto_ops *ops)
spin_unlock_irqrestore(&hcrypt->lock, flags);
if (del_alg) {
printk(KERN_DEBUG "rtllib_crypt: unregistered algorithm "
"'%s'\n", ops->name);
printk(KERN_DEBUG "rtllib_crypt: unregistered algorithm '%s'\n",
ops->name);
kfree(del_alg);
}
......@@ -237,8 +238,9 @@ void __exit rtllib_crypto_deinit(void)
struct rtllib_crypto_alg *alg =
(struct rtllib_crypto_alg *) ptr;
list_del(ptr);
printk(KERN_DEBUG "rtllib_crypt: unregistered algorithm "
"'%s' (deinit)\n", alg->ops->name);
printk(KERN_DEBUG
"rtllib_crypt: unregistered algorithm '%s' (deinit)\n",
alg->ops->name);
kfree(alg);
}
......
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
View file @ 0822339b
......@@ -69,8 +69,7 @@ static void *rtllib_ccmp_init(int key_idx)
priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tfm)) {
pr_debug("rtllib_crypt_ccmp: could not allocate "
"crypto API aes\n");
pr_debug("rtllib_crypt_ccmp: could not allocate crypto API aes\n");
priv->tfm = NULL;
goto fail;
}
......@@ -278,23 +277,22 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
keyidx = pos[3];
if (!(keyidx & (1 << 5))) {
if (net_ratelimit()) {
pr_debug("CCMP: received packet without ExtIV"
" flag from %pM\n", hdr->addr2);
pr_debug("CCMP: received packet without ExtIV flag from %pM\n",
hdr->addr2);
}
key->dot11RSNAStatsCCMPFormatErrors++;
return -2;
}
keyidx >>= 6;
if (key->key_idx != keyidx) {
pr_debug("CCMP: RX tkey->key_idx=%d frame "
"keyidx=%d priv=%p\n", key->key_idx, keyidx, priv);
pr_debug("CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
key->key_idx, keyidx, priv);
return -6;
}
if (!key->key_set) {
if (net_ratelimit()) {
pr_debug("CCMP: received packet from %pM"
" with keyid=%d that does not have a configured"
" key\n", hdr->addr2, keyidx);
pr_debug("CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
hdr->addr2, keyidx);
}
return -3;
}
......@@ -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 (net_ratelimit()) {
pr_debug("CCMP: decrypt failed: STA="
" %pM\n", hdr->addr2);
pr_debug("CCMP: decrypt failed: STA= %pM\n",
hdr->addr2);
}
key->dot11RSNAStatsCCMPDecryptErrors++;
return -5;
......@@ -419,9 +417,7 @@ static void rtllib_ccmp_print_stats(struct seq_file *m, void *priv)
struct rtllib_ccmp_data *ccmp = priv;
seq_printf(m,
"key[%d] alg=CCMP key_set=%d "
"tx_pn=%pM rx_pn=%pM "
"format_errors=%d replays=%d decrypt_errors=%d\n",
"key[%d] alg=CCMP key_set=%d tx_pn=%pM rx_pn=%pM format_errors=%d replays=%d decrypt_errors=%d\n",
ccmp->key_idx, ccmp->key_set,
ccmp->tx_pn, ccmp->rx_pn,
ccmp->dot11RSNAStatsCCMPFormatErrors,
......
drivers/staging/rtl8192e/rtllib_crypt_tkip.c
View file @ 0822339b
......@@ -66,8 +66,8 @@ static void *rtllib_tkip_init(int key_idx)
priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tx_tfm_arc4)) {
printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate "
"crypto API arc4\n");
printk(KERN_DEBUG
"rtllib_crypt_tkip: could not allocate crypto API arc4\n");
priv->tx_tfm_arc4 = NULL;
goto fail;
}
......@@ -75,8 +75,8 @@ static void *rtllib_tkip_init(int key_idx)
priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tx_tfm_michael)) {
printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate "
"crypto API michael_mic\n");
printk(KERN_DEBUG
"rtllib_crypt_tkip: could not allocate crypto API michael_mic\n");
priv->tx_tfm_michael = NULL;
goto fail;
}
......@@ -84,8 +84,8 @@ static void *rtllib_tkip_init(int key_idx)
priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->rx_tfm_arc4)) {
printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate "
"crypto API arc4\n");
printk(KERN_DEBUG
"rtllib_crypt_tkip: could not allocate crypto API arc4\n");
priv->rx_tfm_arc4 = NULL;
goto fail;
}
......@@ -93,8 +93,8 @@ static void *rtllib_tkip_init(int key_idx)
priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->rx_tfm_michael)) {
printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate "
"crypto API michael_mic\n");
printk(KERN_DEBUG
"rtllib_crypt_tkip: could not allocate crypto API michael_mic\n");
priv->rx_tfm_michael = NULL;
goto fail;
}
......@@ -399,22 +399,24 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
keyidx = pos[3];
if (!(keyidx & (1 << 5))) {
if (net_ratelimit()) {
printk(KERN_DEBUG "TKIP: received packet without ExtIV"
" flag from %pM\n", hdr->addr2);
printk(KERN_DEBUG
"TKIP: received packet without ExtIV flag from %pM\n",
hdr->addr2);
}
return -2;
}
keyidx >>= 6;
if (tkey->key_idx != keyidx) {
printk(KERN_DEBUG "TKIP: RX tkey->key_idx=%d frame "
"keyidx=%d priv=%p\n", tkey->key_idx, keyidx, priv);
printk(KERN_DEBUG
"TKIP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
tkey->key_idx, keyidx, priv);
return -6;
}
if (!tkey->key_set) {
if (net_ratelimit()) {
printk(KERN_DEBUG "TKIP: received packet from %pM"
" with keyid=%d that does not have a configured"
" key\n", hdr->addr2, keyidx);
printk(KERN_DEBUG
"TKIP: received packet from %pM with keyid=%d that does not have a configured key\n",
hdr->addr2, keyidx);
}
return -3;
}
......@@ -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)) &&
tkey->initialized) {
if (net_ratelimit()) {
printk(KERN_DEBUG "TKIP: replay detected: STA="
" %pM previous TSC %08x%04x received "
"TSC %08x%04x\n", hdr->addr2,
tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
printk(KERN_DEBUG
"TKIP: replay detected: STA= %pM previous TSC %08x%04x received TSC %08x%04x\n",
hdr->addr2, tkey->rx_iv32, tkey->rx_iv16,
iv32, iv16);
}
tkey->dot11RSNAStatsTKIPReplays++;
return -4;
......@@ -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);
if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {
if (net_ratelimit()) {
printk(KERN_DEBUG ": TKIP: failed to decrypt "
"received packet from %pM\n",
printk(KERN_DEBUG
": TKIP: failed to decrypt received packet from %pM\n",
hdr->addr2);
}
return -7;
......@@ -472,8 +474,9 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
tkey->rx_phase1_done = 0;
}
if (net_ratelimit()) {
printk(KERN_DEBUG "TKIP: ICV error detected: STA="
" %pM\n", hdr->addr2);
printk(KERN_DEBUG
"TKIP: ICV error detected: STA= %pM\n",
hdr->addr2);
}
tkey->dot11RSNAStatsTKIPICVErrors++;
return -5;
......@@ -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;
if (skb_tailroom(skb) < 8 || skb->len < hdr_len) {
printk(KERN_DEBUG "Invalid packet for Michael MIC add "
"(tailroom=%d hdr_len=%d skb->len=%d)\n",
printk(KERN_DEBUG
"Invalid packet for Michael MIC add (tailroom=%d hdr_len=%d skb->len=%d)\n",
skb_tailroom(skb), hdr_len, skb->len);
return -1;
}
......@@ -621,8 +624,8 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx,
struct rtllib_hdr_4addr *hdr;
hdr = (struct rtllib_hdr_4addr *) skb->data;
printk(KERN_DEBUG "%s: Michael MIC verification failed for "
"MSDU from %pM keyidx=%d\n",
printk(KERN_DEBUG
"%s: Michael MIC verification failed for MSDU from %pM keyidx=%d\n",
skb->dev ? skb->dev->name : "N/A", hdr->addr2,
keyidx);
printk(KERN_DEBUG "%d\n",
......@@ -717,10 +720,7 @@ static void rtllib_tkip_print_stats(struct seq_file *m, void *priv)
struct rtllib_tkip_data *tkip = priv;
seq_printf(m,
"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",
"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",
tkip->key_idx, tkip->key_set,
(tkip->tx_iv32 >> 24) & 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)
priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tx_tfm)) {
pr_debug("rtllib_crypt_wep: could not allocate "
"crypto API arc4\n");
pr_debug("rtllib_crypt_wep: could not allocate crypto API arc4\n");
priv->tx_tfm = NULL;
goto fail;
}
priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->rx_tfm)) {
pr_debug("rtllib_crypt_wep: could not allocate "
"crypto API arc4\n");
pr_debug("rtllib_crypt_wep: could not allocate crypto API arc4\n");
priv->rx_tfm = NULL;
goto fail;
}
......@@ -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 ||
skb->len < hdr_len){
printk(KERN_ERR "Error!!! headroom=%d tailroom=%d skblen=%d"
" hdr_len=%d\n", skb_headroom(skb), skb_tailroom(skb),
skb->len, hdr_len);
printk(KERN_ERR
"Error!!! headroom=%d tailroom=%d skblen=%d hdr_len=%d\n",
skb_headroom(skb), skb_tailroom(skb), skb->len, hdr_len);
return -1;
}
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)
/* as for the completion function, it does not need
* to check it any more.
* */
printk(KERN_INFO "%s():insert to waitqueue, queue_index"
":%d!\n", __func__, tcb_desc->queue_index);
printk(KERN_INFO
"%s():insert to waitqueue, queue_index:%d!\n",
__func__, tcb_desc->queue_index);
skb_queue_tail(&ieee->skb_waitQ[tcb_desc->queue_index],
skb);
} else {
......@@ -1418,8 +1419,9 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,
if (ieee->assocreq_ies)
memcpy(ieee->assocreq_ies, ies, ieee->assocreq_ies_len);
else {
printk(KERN_INFO "%s()Warning: can't alloc memory for assocreq"
"_ies\n", __func__);
printk(KERN_INFO
"%s()Warning: can't alloc memory for assocreq_ies\n",
__func__);
ieee->assocreq_ies_len = 0;
}
return skb;
......@@ -1503,8 +1505,7 @@ static void rtllib_auth_challenge(struct rtllib_device *ieee, u8 *challenge, int
*(c++) = chlen;
memcpy(c, challenge, chlen);
RTLLIB_DEBUG_MGMT("Sending authentication challenge "
"response\n");
RTLLIB_DEBUG_MGMT("Sending authentication challenge response\n");
rtllib_encrypt_fragment(ieee, skb,
sizeof(struct rtllib_hdr_3addr));
......@@ -1564,8 +1565,8 @@ static void rtllib_associate_complete_wq(void *data)
printk(KERN_INFO "Successfully associated, ht enabled\n");
HTOnAssocRsp(ieee);
} else {
printk(KERN_INFO "Successfully associated, ht not "
"enabled(%d, %d)\n",
printk(KERN_INFO
"Successfully associated, ht not enabled(%d, %d)\n",
ieee->pHTInfo->bCurrentHTSupport,
ieee->pHTInfo->bEnableHT);
memset(ieee->dot11HTOperationalRateSet, 0, 16);
......@@ -1623,8 +1624,9 @@ static void rtllib_associate_procedure_wq(void *data)
ieee->current_network.channel);
HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
if (ieee->eRFPowerState == eRfOff) {
RT_TRACE(COMP_DBG, "=============>%s():Rf state is eRfOff,"
" schedule ipsleave wq again,return\n", __func__);
RT_TRACE(COMP_DBG,
"=============>%s():Rf state is eRfOff, schedule ipsleave wq again,return\n",
__func__);
if (ieee->rtllib_ips_leave_wq != NULL)
ieee->rtllib_ips_leave_wq(ieee->dev);
up(&ieee->wx_sem);
......@@ -1719,9 +1721,9 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
IW_ESSID_MAX_SIZE);
ieee->current_network.ssid_len = tmp_ssid_len;
}
printk(KERN_INFO"Linking with %s,channel:%d, qos:%d, "
"myHT:%d, networkHT:%d, mode:%x cur_net.flags"
":0x%x\n", ieee->current_network.ssid,
printk(KERN_INFO
"Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d, mode:%x cur_net.flags:0x%x\n",
ieee->current_network.ssid,
ieee->current_network.channel,
ieee->current_network.qos_data.supported,
ieee->pHTInfo->bEnableHT,
......@@ -2083,10 +2085,9 @@ static inline void rtllib_sta_ps(struct rtllib_device *ieee)
if ((ieee->ps == RTLLIB_PS_DISABLED ||
ieee->iw_mode != IW_MODE_INFRA ||
ieee->state != RTLLIB_LINKED)) {
RT_TRACE(COMP_DBG, "=====>%s(): no need to ps,wake up!! "
"ieee->ps is %d, ieee->iw_mode is %d, ieee->state"
" is %d\n", __func__, ieee->ps, ieee->iw_mode,
ieee->state);
RT_TRACE(COMP_DBG,
"=====>%s(): no need to ps,wake up!! ieee->ps is %d, ieee->iw_mode is %d, ieee->state is %d\n",
__func__, ieee->ps, ieee->iw_mode, ieee->state);
spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
rtllib_sta_wakeup(ieee, 1);
......@@ -2201,8 +2202,8 @@ static void rtllib_process_action(struct rtllib_device *ieee, struct sk_buff *sk
u8 category = 0;
if (act == NULL) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "error to get payload of "
"action frame\n");
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"error to get payload of action frame\n");
return;
}
......@@ -2287,8 +2288,9 @@ inline int rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
memcpy(ieee->assocresp_ies, ies,
ieee->assocresp_ies_len);
else {
printk(KERN_INFO "%s()Warning: can't alloc "
"memory for assocresp_ies\n", __func__);
printk(KERN_INFO
"%s()Warning: can't alloc memory for assocresp_ies\n",
__func__);
ieee->assocresp_ies_len = 0;
}
rtllib_associate_complete(ieee);
......@@ -2353,8 +2355,8 @@ inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,
if (ieee->current_network.mode ==
IEEE_N_24G && bHalfSupportNmode) {
printk(KERN_INFO "======>enter "
"half N mode\n");
printk(KERN_INFO
"======>enter half N mode\n");
ieee->bHalfWirelessN24GMode =
true;
} else
......@@ -2368,11 +2370,12 @@ inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,
}
} else {
ieee->softmac_stats.rx_auth_rs_err++;
RTLLIB_DEBUG_MGMT("Authentication respose"
" status code 0x%x", errcode);
RTLLIB_DEBUG_MGMT("Authentication respose status code 0x%x",
errcode);
printk(KERN_INFO "Authentication respose "
"status code 0x%x", errcode);
printk(KERN_INFO
"Authentication respose status code 0x%x",
errcode);
rtllib_associate_abort(ieee);
}
......@@ -2396,8 +2399,8 @@ inline int rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb)
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
ieee->state == RTLLIB_LINKED &&
(ieee->iw_mode == IW_MODE_INFRA)) {
printk(KERN_INFO "==========>received disassoc/deauth(%x) "
"frame, reason code:%x\n",
printk(KERN_INFO
"==========>received disassoc/deauth(%x) frame, reason code:%x\n",
WLAN_FC_GET_STYPE(header->frame_ctl),
((struct rtllib_disassoc *)skb->data)->reason);
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,
if ((!ieee->sta_wake_up) ||
(!ieee->enter_sleep_state) ||
(!ieee->ps_is_queue_empty)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "%s(): PS mode is tried to be use "
"but driver missed a callback\n\n", __func__);
RTLLIB_DEBUG(RTLLIB_DL_ERR,
"%s(): PS mode is tried to be use but driver missed a callback\n\n",
__func__);
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)
if (ieee->iw_mode == IW_MODE_MONITOR) {
txb = rtllib_alloc_txb(1, skb->len, GFP_ATOMIC);
if (unlikely(!txb)) {
printk(KERN_WARNING "%s: Could not allocate "
"TXB\n",
printk(KERN_WARNING
"%s: Could not allocate TXB\n",
ieee->dev->name);
goto failed;
}
......@@ -636,8 +636,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
}
}
} else if (ETH_P_ARP == ether_type) {
printk(KERN_INFO "=================>DHCP "
"Protocol start tx ARP pkt!!\n");
printk(KERN_INFO
"=================>DHCP Protocol start tx ARP pkt!!\n");
bdhcp = true;
ieee->LPSDelayCnt =
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,
ev = rtl819x_translate_scan(ieee, ev, stop, network,
info);
else
RTLLIB_DEBUG_SCAN("Not showing network '%s ("
" %pM)' due to age (%lums).\n",
RTLLIB_DEBUG_SCAN("Not showing network '%s ( %pM)' due to age (%lums).\n",
escape_essid(network->ssid,
network->ssid_len),
network->bssid,
......@@ -437,8 +436,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
/* No key data - just set the default TX key index */
if (key_provided) {
RTLLIB_DEBUG_WX(
"Setting key %d to default Tx key.\n", key);
RTLLIB_DEBUG_WX("Setting key %d to default Tx key.\n",
key);
ieee->crypt_info.tx_keyidx = key;
sec.active_key = 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