staging: rtl8192e: checkpatch.pl cleanups
v2 cover staging: rtl8192e: checkpatch.pl cleanups
v2 Notes:
Added 2 more patches (none affects code):
#12 cleanup of comment style (Joe requested to fix one, did fix of as many as
I was able to find)
#13 Removed dead code (some functions/structures/defines were commented out)
As for v1 review comments - I decided not to merge #10 and #11 to make bisect easier (patch that may cause regressions will be as simple as possible)
Still have no proper antennas - only smoke test performed.
checkpatch.pl reports long-lines on some comments, but decidet not to reformat them for now (this driver for now is full of >80 character lines, it's least of issues it has)
v1 Notes:
This series of patches cleans bunch of checkpatch.pl warnings. It should apply to staging-next (153fe946) and staging-testing (f8da055a).
Patch 10 changes code/logic a bit (but behaviour should not change). Remaining patches are trivial.
Smoke tested on rtl8192e card vs staging-next:
- Module load/unload
- Interface up/down
For now I'm not able to do more tests as I don't have proper antennas
Mateusz Kulikowski (13):
staging: rtl8192e: Fix UNNECESSARY_ELSE warning
staging: rtl8192e: Fix RETURN_VOID warnings
staging: rtl8192e: remove unused EXPORT_SYMBOL_RSL macro
staging: rtl8192e: Fix UNNECESSARY_PARENTHESES warnings
staging: rtl8192e: Fix LINE_CONTINUATIONS warning
staging: rtl8192e: Fix BRACES warning
staging: rtl8192e: Fix DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON warning
staging: rtl8192e: Fix PRINTK_WITHOUT_KERN_LEVEL warnings
staging: rtl8192e: Divide rtllib_rx_auth()
staging: rtl8192e: Decrease nesting of rtllib_rx_auth_resp()
staging: rtl8192e: Fix indentation in rtllib_rx_auth_resp()
staging: rtl8192e: Comment cleanup (style/format)
staging: rtl8192e: Remove dead code
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 30 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 77 +++-- .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 6 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 22 +- drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h | 7 - drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 7 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 225 +++++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 319 ++++++++++----------- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 9 +- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 29 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 34 ++- drivers/staging/rtl8192e/rtl819x_TSProc.c | 120 ++++---- drivers/staging/rtl8192e/rtllib.h | 109 ++++--- drivers/staging/rtl8192e/rtllib_crypt.c | 3 +- drivers/staging/rtl8192e/rtllib_crypt.h | 3 +- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 8 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 15 +- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 3 +- drivers/staging/rtl8192e/rtllib_debug.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 229 +++++++-------- drivers/staging/rtl8192e/rtllib_softmac.c | 211 +++++++------- drivers/staging/rtl8192e/rtllib_tx.c | 303 +++++++++---------- drivers/staging/rtl8192e/rtllib_wx.c | 23 +- 24 files changed, 869 insertions(+), 927 deletions(-)
Signature · 1 line
1.8.4.1
PATCH v2 1/13 staging: rtl8192e: Fix UNNECESSARY_ELSE warning
Fix checkpatch warnings 'else is not generally useful after a break or return'
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 72 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 10 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 7 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 213 ++++++++--------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 307 ++++++++++++------------- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 9 +- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 24 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 31 ++- drivers/staging/rtl8192e/rtl819x_TSProc.c | 120 +++++----- drivers/staging/rtl8192e/rtllib_rx.c | 118 +++++----- drivers/staging/rtl8192e/rtllib_softmac.c | 11 +- drivers/staging/rtl8192e/rtllib_tx.c | 78 ++++--- 12 files changed, 482 insertions(+), 518 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +34 -38
@@ -2025,6 +2025,7 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev, struct sk_buff *skb) {struct r8192_priv *priv =rtllib_priv (dev); +struct rx_fwinfo *pDrvInfo =NULL ; stats->bICV = pdesc->ICV; stats->bCRC = pdesc->CRC32;
@@ -2046,51 +2047,49 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev, priv->stats.rxcrcerrmid++; }return false; - }else { -struct rx_fwinfo *pDrvInfo =NULL ; + } - stats->RxDrvInfoSize = pdesc->RxDrvInfoSize; - stats->RxBufShift = ((pdesc->Shift)&0x03 ); - stats->Decrypted = !pdesc->SWDec; + stats->RxDrvInfoSize = pdesc->RxDrvInfoSize; + stats->RxBufShift = ((pdesc->Shift)&0x03 ); + stats->Decrypted = !pdesc->SWDec; - pDrvInfo = (struct rx_fwinfo *)(skb->data + stats->RxBufShift); + pDrvInfo = (struct rx_fwinfo *)(skb->data + stats->RxBufShift); - stats->rate =HwRateToMRate90 ((bool )pDrvInfo->RxHT, - (u8 )pDrvInfo->RxRate); - stats->bShortPreamble = pDrvInfo->SPLCP; + stats->rate =HwRateToMRate90 ((bool )pDrvInfo->RxHT, + (u8 )pDrvInfo->RxRate); + stats->bShortPreamble = pDrvInfo->SPLCP; -rtl8192_UpdateReceivedRateHistogramStatistics (dev, stats); +rtl8192_UpdateReceivedRateHistogramStatistics (dev, stats); - stats->bIsAMPDU = (pDrvInfo->PartAggr ==1 ); - stats->bFirstMPDU = (pDrvInfo->PartAggr ==1 ) && - (pDrvInfo->FirstAGGR ==1 ); + stats->bIsAMPDU = (pDrvInfo->PartAggr ==1 ); + stats->bFirstMPDU = (pDrvInfo->PartAggr ==1 ) && + (pDrvInfo->FirstAGGR ==1 ); - stats->TimeStampLow = pDrvInfo->TSFL; - stats->TimeStampHigh =read_nic_dword (dev,TSFR +4 ); + stats->TimeStampLow = pDrvInfo->TSFL; + stats->TimeStampHigh =read_nic_dword (dev,TSFR +4 ); -rtl819x_UpdateRxPktTimeStamp (dev, stats); +rtl819x_UpdateRxPktTimeStamp (dev, stats); -if ((stats->RxBufShift + stats->RxDrvInfoSize) >0 ) - stats->bShift =1 ; +if ((stats->RxBufShift + stats->RxDrvInfoSize) >0 ) + stats->bShift =1 ; - stats->RxIs40MHzPacket = pDrvInfo->BW; + stats->RxIs40MHzPacket = pDrvInfo->BW; -rtl8192_TranslateRxSignalStuff (dev, skb, stats, pdesc, - pDrvInfo); +rtl8192_TranslateRxSignalStuff (dev, skb, stats, pdesc, + pDrvInfo); -if (pDrvInfo->FirstAGGR ==1 || pDrvInfo->PartAggr ==1 ) -RT_TRACE (COMP_RXDESC , -"pDrvInfo->FirstAGGR = %d, pDrvInfo->PartAggr = %d\n" , - pDrvInfo->FirstAGGR, pDrvInfo->PartAggr); -skb_trim (skb, skb->len -4 /*sCrcLng*/ ); +if (pDrvInfo->FirstAGGR ==1 || pDrvInfo->PartAggr ==1 ) +RT_TRACE (COMP_RXDESC , +"pDrvInfo->FirstAGGR = %d, pDrvInfo->PartAggr = %d\n" , + pDrvInfo->FirstAGGR, pDrvInfo->PartAggr); +skb_trim (skb, skb->len -4 /*sCrcLng*/ ); - stats->packetlength = stats->Length-4 ; - stats->fraglength = stats->packetlength; - stats->fragoffset =0 ; - stats->ntotalfrag =1 ; -return true; - } + stats->packetlength = stats->Length-4 ; + stats->fraglength = stats->packetlength; + stats->fragoffset =0 ; + stats->ntotalfrag =1 ; +return true; }void rtl8192_halt_adapter (struct net_device *dev,bool reset)
@@ -2314,8 +2313,7 @@ bool rtl8192_HalRxCheckStuck(struct net_device *dev) (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_20M)))) {if (rx_chk_cnt <2 )return bStuck; -else - rx_chk_cnt =0 ; + rx_chk_cnt =0 ; } else if ((((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) && (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M)) || ((priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) &&
@@ -2323,13 +2321,11 @@ bool rtl8192_HalRxCheckStuck(struct net_device *dev) priv->undecorated_smoothed_pwdb >= VeryLowRSSI) { if (rx_chk_cnt < 4) return bStuck; - else - rx_chk_cnt = 0; + rx_chk_cnt = 0; } else {if (rx_chk_cnt <8 )return bStuck; -else - rx_chk_cnt =0 ; + rx_chk_cnt =0 ; }
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +4 -6
@@ -940,13 +940,11 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, }if (CurrentCmd && CurrentCmd->CmdID == CmdID_End) { -if ((*stage) ==2 ) { +if ((*stage) ==2 )return true; - }else { - (*stage)++; - (*step) =0 ; -continue ; - } + (*stage)++; + (*step) =0 ; +continue ; }if (!CurrentCmd)
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +3 -4
@@ -116,11 +116,10 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,RT_TRACE (COMP_ERR ,"%s(): RF is OFF.\n" , __func__);return ; - }else { -down (&priv->rtllib->ips_sem); -IPSLeave (dev); -up (&priv->rtllib->ips_sem); } +down (&priv->rtllib->ips_sem); +IPSLeave (dev); +up (&priv->rtllib->ips_sem); } } priv->rtllib->is_set_key = true;
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +101 -112
264 lines not on this page · raw message
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +148 -159
379 lines not on this page · raw message
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +4 -5
@@ -202,12 +202,11 @@ void rtllib_ips_leave_wq(struct net_device *dev)RT_TRACE (COMP_ERR ,"%s(): RF is OFF.\n" , __func__);return ; - }else { -netdev_info (dev,"=========>%s(): IPSLeave\n" , - __func__); -queue_work_rsl (priv->rtllib->wq, - &priv->rtllib->ips_leave_wq); } +netdev_info (dev,"=========>%s(): IPSLeave\n" , + __func__); +queue_work_rsl (priv->rtllib->wq, + &priv->rtllib->ips_leave_wq); } } }
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +10 -14
@@ -346,14 +346,12 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a, __func__);up (&priv->wx_sem);return -1 ; - }else { -netdev_info (dev, -"=========>%s(): IPSLeave\n" , - __func__); -down (&priv->rtllib->ips_sem); -IPSLeave (dev); -up (&priv->rtllib->ips_sem); } +netdev_info (dev,"=========>%s(): IPSLeave\n" , + __func__); +down (&priv->rtllib->ips_sem); +IPSLeave (dev); +up (&priv->rtllib->ips_sem); } } }
@@ -509,14 +507,12 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a, __func__);up (&priv->wx_sem);return -1 ; - }else { -RT_TRACE (COMP_PS , -"=========>%s(): IPSLeave\n" , - __func__); -down (&priv->rtllib->ips_sem); -IPSLeave (dev); -up (&priv->rtllib->ips_sem); } +RT_TRACE (COMP_PS ,"=========>%s(): IPSLeave\n" , + __func__); +down (&priv->rtllib->ips_sem); +IPSLeave (dev); +up (&priv->rtllib->ips_sem); } }rtllib_stop_scan (priv->rtllib);
drivers/staging/rtl8192e/rtl819x_HTProc.c +14 -17
@@ -135,25 +135,22 @@ u16 TxCountToDataRate(struct rtllib_device *ieee, u8 nDataRate)u8 is40MHz =0 ;u8 isShortGI =0 ; -if (nDataRate <12 ) { +if (nDataRate <12 )return CCKOFDMRate[nDataRate]; - }else { -if (nDataRate >=0x10 && nDataRate <=0x1f ) { - is40MHz =0 ; - isShortGI =0 ; - }else if (nDataRate >=0x20 && nDataRate <=0x2f ) { - is40MHz =1 ; - isShortGI =0 ; - - }else if (nDataRate >=0x30 && nDataRate <=0x3f ) { - is40MHz =0 ; - isShortGI =1 ; - }else if (nDataRate >=0x40 && nDataRate <=0x4f ) { - is40MHz =1 ; - isShortGI =1 ; - } -return MCS_DATA_RATE [is40MHz][isShortGI][nDataRate&0xf ]; +if (nDataRate >=0x10 && nDataRate <=0x1f ) { + is40MHz =0 ; + isShortGI =0 ; + }else if (nDataRate >=0x20 && nDataRate <=0x2f ) { + is40MHz =1 ; + isShortGI =0 ; + }else if (nDataRate >=0x30 && nDataRate <=0x3f ) { + is40MHz =0 ; + isShortGI =1 ; + }else if (nDataRate >=0x40 && nDataRate <=0x4f ) { + is40MHz =1 ; + isShortGI =1 ; } +return MCS_DATA_RATE [is40MHz][isShortGI][nDataRate&0xf ]; }bool IsHTHalfNmodeAPs (struct rtllib_device *ieee)
drivers/staging/rtl8192e/rtl819x_TSProc.c +60 -60
141 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_rx.c +59 -59
133 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_softmac.c +5 -6
@@ -2540,13 +2540,12 @@ static void rtllib_resume_tx(struct rtllib_device *ieee)if (ieee->queue_stop) { ieee->tx_pending.frag = i;return ; - }else { - - ieee->softmac_data_hard_start_xmit ( - ieee->tx_pending.txb->fragments[i], - ieee->dev, ieee->rate); - ieee->stats.tx_packets++; } + + ieee->softmac_data_hard_start_xmit ( + ieee->tx_pending.txb->fragments[i], + ieee->dev, ieee->rate); + ieee->stats.tx_packets++; }rtllib_txb_free (ieee->tx_pending.txb);
drivers/staging/rtl8192e/rtllib_tx.c +40 -38
96 lines not on this page · raw message
Signature · 1 line
1.8.4.1
PATCH v2 2/13 staging: rtl8192e: Fix RETURN_VOID warnings
In reply to Mateusz KulikowskiFix 'void function return statements are not generally useful' checkpatch.pl warnings
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 -------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 ------- drivers/staging/rtl8192e/rtllib_rx.c | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 1 - 5 files changed, 19 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +0 -2
@@ -2137,7 +2137,6 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)skb_queue_purge (&priv->rtllib->skb_aggQ[i]);skb_queue_purge (&priv->skb_queue); -return ; }void rtl8192_update_ratr_table (struct net_device *dev)
@@ -2415,5 +2414,4 @@ void ActUpdateChannelAccessSetting(struct net_device *dev,enum wireless_mode WirelessMode, struct channel_access_setting *ChnlAccessSetting) { -return ; }
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +0 -8
@@ -94,7 +94,6 @@ void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,write_nic_dword (dev, dwRegAddr, NewValue); }else write_nic_dword (dev, dwRegAddr, dwData); -return ; }u32 rtl8192_QueryBBReg (struct net_device *dev,u32 dwRegAddr,u32 dwBitMask)
@@ -215,7 +214,6 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev, }rtl8192_setBBreg (dev, rFPGA0_AnalogParameter4,0x300 ,0x3 ); } -return ; } void rtl8192_phy_SetRFReg(struct net_device *dev, enum rf90_radio_path eRFPath,
@@ -256,7 +254,6 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, enum rf90_radio_path eRFPath, }else rtl8192_phy_RFSerialWrite (dev, eRFPath, RegAddr, Data); } -return ; } u32 rtl8192_phy_QueryRFReg(struct net_device *dev, enum rf90_radio_path eRFPath,
@@ -399,7 +396,6 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType) Rtl819XAGCTAB_Array_Table[i+1]); } } -return ; }static void rtl8192_InitBBRFRegDef (struct net_device *dev)
@@ -640,7 +636,6 @@ void rtl8192_phy_getTxPower(struct net_device *dev)RT_TRACE (COMP_INIT ,"Default framesync (0x%x) = 0x%x\n" , rOFDM0_RxDetector3, priv->framesync); priv->SifsTime =read_nic_word (dev,SIFS ); -return ; }void rtl8192_phy_setTxPower (struct net_device *dev,u8 channel)
@@ -694,7 +689,6 @@ void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel) __func__);break ; } -return ; }bool rtl8192_phy_RFConfig (struct net_device *dev)
@@ -723,7 +717,6 @@ bool rtl8192_phy_RFConfig(struct net_device *dev)void rtl8192_phy_updateInitGain (struct net_device *dev) { -return ; } u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev,
@@ -813,7 +806,6 @@ static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel) "unknown rf chip ID in rtl8192_SetTxPowerLevel()\n");break ; } -return ; } static u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable,
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -7
@@ -741,8 +741,6 @@ static void rtl8192_prepare_beacon(struct r8192_priv *priv) priv->ops->tx_fill_descriptor (dev, pdesc, tcb_desc, pnewskb);__skb_queue_tail (&ring->queue, pnewskb); pdesc->OWN =1 ; - -return ; }static void rtl8192_stop_beacon (struct net_device *dev)
@@ -856,7 +854,6 @@ static void rtl8192_refresh_supportrate(struct r8192_priv *priv) }else {memset (ieee->Regdot11HTOperationalRateSet,0 ,16 ); } -return ; }static u8 rtl8192_getSupportedWireleeMode (struct net_device *dev)
@@ -1901,8 +1898,6 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, priv->rtllib->tx_headroom); priv->rtllib->stats.tx_packets++; } - -return ; }int rtl8192_hard_start_xmit (struct sk_buff *skb,struct net_device *dev)
@@ -1985,8 +1980,6 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)__skb_queue_tail (&ring->queue, skb);spin_unlock_irqrestore (&priv->irq_th_lock, flags); - -return ; }short rtl8192_tx (struct net_device *dev,struct sk_buff *skb)
drivers/staging/rtl8192e/rtllib_rx.c +0 -1
@@ -2623,7 +2623,6 @@ static inline void rtllib_process_probe_response( } free_network:kfree (network); -return ; } void rtllib_rx_mgt(struct rtllib_device *ieee,
drivers/staging/rtl8192e/rtllib_softmac.c +0 -1
@@ -2228,7 +2228,6 @@ static void rtllib_process_action(struct rtllib_device *ieee, struct sk_buff *skdefault :break ; } -return ; } inline int rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
Signature · 1 line
1.8.4.1
PATCH v2 3/13 staging: rtl8192e: remove unused EXPORT_SYMBOL_RSL macro
In reply to Mateusz KulikowskiThis macro caused checkpatch.pl warning and is not used.
--- drivers/staging/rtl8192e/rtllib.h | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -3
@@ -68,9 +68,6 @@#define skb_tail_pointer_rsl (skb) skb_tail_pointer(skb) -#define EXPORT_SYMBOL_RSL (x) EXPORT_SYMBOL(x) - -#define queue_delayed_work_rsl (x, y, z) queue_delayed_work(x, y, z)#define INIT_DELAYED_WORK_RSL (x, y, z) INIT_DELAYED_WORK(x, y)
Signature · 1 line
1.8.4.1
PATCH v2 4/13 staging: rtl8192e: Fix UNNECESSARY_PARENTHESES warnings
In reply to Mateusz KulikowskiFix 'Unnecessary parentheses' checkpatch.pl warning
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib_rx.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +2 -2
@@ -608,7 +608,7 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,if (priv->rtllib->state !=RTLLIB_LINKED )return ret; -if ((priv->rtllib->iw_mode !=IW_MODE_INFRA )) +if (priv->rtllib->iw_mode !=IW_MODE_INFRA )return ret;if (network->flags &NETWORK_HAS_QOS_MASK ) {
@@ -669,7 +669,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,if (priv->rtllib->state !=RTLLIB_LINKED )return 0 ; -if ((priv->rtllib->iw_mode !=IW_MODE_INFRA )) +if (priv->rtllib->iw_mode !=IW_MODE_INFRA )return 0 ;spin_lock_irqsave (&priv->rtllib->lock, flags);
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +6 -6
@@ -498,7 +498,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)write_nic_byte (dev, FW_Busy_Flag,0 );return ; } -if ((priv->rtllib->eRFPowerState != eRfOn)) { +if (priv->rtllib->eRFPowerState != eRfOn) {RT_TRACE (COMP_POWER_TRACKING ,"we are in power save, so return\n" );write_nic_byte (dev, Pw_Track_Flag,0 );
@@ -1824,7 +1824,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_low_thresh) && (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_thresh))return ; -if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh)) { +if (priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh) {if (dm_digtable.dig_state ==DM_STA_DIG_OFF && (priv->reset_count == reset_cnt))return ;
@@ -1850,7 +1850,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(return ; } -if ((priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh)) { +if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) {u8 reset_flag =0 ; if (dm_digtable.dig_state == DM_STA_DIG_ON &&
@@ -1998,7 +1998,7 @@ static void dm_pd_th(struct net_device *dev)if (dm_digtable.CurSTAConnectState ==DIG_STA_CONNECT ) {if (dm_digtable.rssi_val >= dm_digtable.rssi_high_power_highthresh) dm_digtable.curpd_thstate =DIG_PD_AT_HIGH_POWER ; -else if ((dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh)) +else if (dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh) dm_digtable.curpd_thstate =DIG_PD_AT_LOW_POWER ;else if ((dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh) && (dm_digtable.rssi_val < dm_digtable.rssi_high_power_lowthresh))
@@ -2055,9 +2055,9 @@ static void dm_cs_ratio(struct net_device *dev)if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) {if (dm_digtable.CurSTAConnectState ==DIG_STA_CONNECT ) { -if ((dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh)) +if (dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh) dm_digtable.curcs_ratio_state =DIG_CS_RATIO_LOWER ; -else if ((dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh)) +else if (dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh) dm_digtable.curcs_ratio_state =DIG_CS_RATIO_HIGHER ;else dm_digtable.curcs_ratio_state = dm_digtable.precs_ratio_state;
drivers/staging/rtl8192e/rtllib_rx.c +1 -1
@@ -1166,7 +1166,7 @@ static void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 {if (unicast) { -if ((ieee->state ==RTLLIB_LINKED )) { +if (ieee->state ==RTLLIB_LINKED ) {if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + ieee->LinkDetectInfo.NumTxOkInPeriod) >8 ) || (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod >2 )) {
Signature · 1 line
1.8.4.1
PATCH v2 5/13 staging: rtl8192e: Fix LINE_CONTINUATIONS warning
In reply to Mateusz KulikowskiFix 'Avoid unnecessary line continuations' checkpatch.pl warning
--- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192e/rtllib_softmac.c +1 -1
@@ -2503,7 +2503,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)* the wait queue */ for (i =0 ; i < txb->nr_frags; i++) { queue_len =skb_queue_len (&ieee->skb_waitQ[queue_index]); -if ((queue_len !=0 ) ||\ +if ((queue_len !=0 ) || (!ieee->check_nic_enough_desc (ieee->dev, queue_index)) || (ieee->queue_stop)) {/* insert the skb packet to the wait queue */
Signature · 1 line
1.8.4.1
PATCH v2 6/13 staging: rtl8192e: Fix BRACES warning
In reply to Mateusz KulikowskiFix 'braces {} are not necessary for single statement blocks' checkpatch.pl warning
--- drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +2 -4
@@ -301,13 +301,11 @@ bool init_firmware(struct net_device *dev) file_length = pfirmware->firmware_buf_size[init_step]; rt_status =fw_download_code (dev, mapped_file, file_length); -if (!rt_status) { +if (!rt_status) goto download_firmware_fail; - } -if (!firmware_check_ready (dev, init_step)) { +if (!firmware_check_ready (dev, init_step)) goto download_firmware_fail; - } }RT_TRACE (COMP_FIRMWARE ,"Firmware Download Success\n" );
Signature · 1 line
1.8.4.1
PATCH v2 7/13 staging: rtl8192e: Fix DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON warning
In reply to Mateusz KulikowskiFix 'do {} while (0) macros should not be semicolon terminated' checkpatch.pl warning
--- drivers/staging/rtl8192e/rtllib_debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192e/rtllib_debug.h +1 -1
@@ -83,6 +83,6 @@ do { \ pr_info("Assertion failed! %s,%s,%s,line=%d\n", \#expr , __FILE__, __func__, __LINE__); \ } \ -} while (0); +} while (0)#endif
Signature · 1 line
1.8.4.1
PATCH v2 8/13 staging: rtl8192e: Fix PRINTK_WITHOUT_KERN_LEVEL warnings
In reply to Mateusz KulikowskiReplace custom hex dumping function with print_hex_dump_bytes() to make checkpatch.pl happy
--- drivers/staging/rtl8192e/rtllib.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/staging/rtl8192e/rtllib.h +2 -8
@@ -690,15 +690,9 @@ do { \#define RTLLIB_DEBUG_DATA (level, data, datalen) \ do { \ if ((rtllib_debug_level & (level)) == (level)) { \ - int i; \ - u8 *pdata = (u8 *)data; \ printk(KERN_DEBUG "rtllib: %s()\n", __func__); \ - for (i = 0; i < (int)(datalen); i++) { \ - printk("%2.2x ", pdata[i]); \ - if ((i+1)%16 == 0) \ - printk("\n"); \ - } \ - printk("\n"); \ + print_hex_dump_bytes(KERN_DEBUG, DUMP_PREFIX_NONE, \ + data, datalen); \ } \ } while (0)
Signature · 1 line
1.8.4.1
PATCH v2 9/13 staging: rtl8192e: Divide rtllib_rx_auth()
In reply to Mateusz KulikowskiMove authentication response processing to rtllib_rx_auth_resp() function. No logic is affected.
--- drivers/staging/rtl8192e/rtllib_softmac.c | 112 ++++++++++++++++-------------- 1 file changed, 58 insertions(+), 54 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +58 -54
@@ -2314,73 +2314,77 @@ inline int rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,return 0 ; } -inline int rtllib_rx_auth (struct rtllib_device *ieee,struct sk_buff *skb, -struct rtllib_rx_stats *rx_stats) +static void rtllib_rx_auth_resp (struct rtllib_device *ieee,struct sk_buff *skb) {u16 errcode;u8 *challenge;int chlen =0 ;bool bSupportNmode = true, bHalfSupportNmode = false; -if (ieee->softmac_features &IEEE_SOFTMAC_ASSOCIATE ) { -if (ieee->state ==RTLLIB_ASSOCIATING_AUTHENTICATING && - (ieee->iw_mode ==IW_MODE_INFRA )) { -RTLLIB_DEBUG_MGMT ("Received authentication response" ); - - errcode =auth_parse (skb, &challenge, &chlen); -if (0 == errcode) { -if (ieee->open_wep || !challenge) { - ieee->state =RTLLIB_ASSOCIATING_AUTHENTICATED ; - ieee->softmac_stats.rx_auth_rs_ok++; -if (!(ieee->pHTInfo->IOTAction & -HT_IOT_ACT_PURE_N_MODE )) { -if (!ieee->GetNmodeSupportBySecCfg (ieee->dev)) { -if (IsHTHalfNmodeAPs (ieee)) { - bSupportNmode = true; - bHalfSupportNmode = true; - }else { - bSupportNmode = false; - bHalfSupportNmode = false; - } - } - } -/* Dummy wirless mode setting to avoid -* encryption issue */ -if (bSupportNmode) { - ieee->SetWirelessMode (ieee->dev, - ieee->current_network.mode); + errcode =auth_parse (skb, &challenge, &chlen); +if (0 == errcode) { +if (ieee->open_wep || !challenge) { + ieee->state =RTLLIB_ASSOCIATING_AUTHENTICATED ; + ieee->softmac_stats.rx_auth_rs_ok++; +if (!(ieee->pHTInfo->IOTAction & +HT_IOT_ACT_PURE_N_MODE )) { +if (!ieee->GetNmodeSupportBySecCfg (ieee->dev)) { +if (IsHTHalfNmodeAPs (ieee)) { + bSupportNmode = true; + bHalfSupportNmode = true; }else { -/*TODO*/ - ieee->SetWirelessMode (ieee->dev, -IEEE_G ); + bSupportNmode = false; + bHalfSupportNmode = false; } - -if (ieee->current_network.mode == -IEEE_N_24G && bHalfSupportNmode) { -netdev_info (ieee->dev, -"======>enter half N mode\n" ); - ieee->bHalfWirelessN24GMode = - true; - }else - ieee->bHalfWirelessN24GMode = - false; - -rtllib_associate_step2 (ieee); - }else { -rtllib_auth_challenge (ieee, challenge, - chlen); } + } +/* Dummy wirless mode setting to avoid +* encryption issue */ +if (bSupportNmode) { + ieee->SetWirelessMode (ieee->dev, + ieee->current_network.mode); }else { - ieee->softmac_stats.rx_auth_rs_err++; -RTLLIB_DEBUG_MGMT ("Authentication respose status code 0x%x" , - errcode); +/*TODO*/ + ieee->SetWirelessMode (ieee->dev, +IEEE_G ); + } +if (ieee->current_network.mode == +IEEE_N_24G && bHalfSupportNmode) {netdev_info (ieee->dev, -"Authentication respose status code 0x%x" , - errcode); -rtllib_associate_abort (ieee); - } +"======>enter half N mode\n" ); + ieee->bHalfWirelessN24GMode = + true; + }else + ieee->bHalfWirelessN24GMode = + false; + +rtllib_associate_step2 (ieee); + }else { +rtllib_auth_challenge (ieee, challenge, + chlen); + } + }else { + ieee->softmac_stats.rx_auth_rs_err++; +RTLLIB_DEBUG_MGMT ("Authentication respose status code 0x%x" , + errcode); + +netdev_info (ieee->dev, +"Authentication respose status code 0x%x" , + errcode); +rtllib_associate_abort (ieee); + } +} +inline int rtllib_rx_auth (struct rtllib_device *ieee,struct sk_buff *skb, +struct rtllib_rx_stats *rx_stats) +{ + +if (ieee->softmac_features &IEEE_SOFTMAC_ASSOCIATE ) { +if (ieee->state ==RTLLIB_ASSOCIATING_AUTHENTICATING && + (ieee->iw_mode ==IW_MODE_INFRA )) { +RTLLIB_DEBUG_MGMT ("Received authentication response" ); +rtllib_rx_auth_resp (ieee, skb); }else if (ieee->iw_mode ==IW_MODE_MASTER ) {rtllib_rx_auth_rq (ieee, skb); }
Signature · 1 line
1.8.4.1
PATCH v2 10/13 staging: rtl8192e: Decrease nesting of rtllib_rx_auth_resp()
In reply to Mateusz KulikowskiReturn from rtllib_rx_auth_resp() if auth_parse() fails.
--- drivers/staging/rtl8192e/rtllib_softmac.c | 89 ++++++++++++++++--------------- 1 file changed, 45 insertions(+), 44 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +45 -44
@@ -2322,57 +2322,58 @@ static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb)bool bSupportNmode = true, bHalfSupportNmode = false; errcode =auth_parse (skb, &challenge, &chlen); -if (0 == errcode) { -if (ieee->open_wep || !challenge) { - ieee->state =RTLLIB_ASSOCIATING_AUTHENTICATED ; - ieee->softmac_stats.rx_auth_rs_ok++; -if (!(ieee->pHTInfo->IOTAction & -HT_IOT_ACT_PURE_N_MODE )) { -if (!ieee->GetNmodeSupportBySecCfg (ieee->dev)) { -if (IsHTHalfNmodeAPs (ieee)) { - bSupportNmode = true; - bHalfSupportNmode = true; - }else { - bSupportNmode = false; - bHalfSupportNmode = false; - } - } - } -/* Dummy wirless mode setting to avoid -* encryption issue */ -if (bSupportNmode) { - ieee->SetWirelessMode (ieee->dev, - ieee->current_network.mode); - }else { -/*TODO*/ - ieee->SetWirelessMode (ieee->dev, -IEEE_G ); - } -if (ieee->current_network.mode == -IEEE_N_24G && bHalfSupportNmode) { -netdev_info (ieee->dev, -"======>enter half N mode\n" ); - ieee->bHalfWirelessN24GMode = - true; - }else - ieee->bHalfWirelessN24GMode = - false; - -rtllib_associate_step2 (ieee); - }else { -rtllib_auth_challenge (ieee, challenge, - chlen); - } - }else { +if (errcode) { ieee->softmac_stats.rx_auth_rs_err++;RTLLIB_DEBUG_MGMT ("Authentication respose status code 0x%x" , errcode);netdev_info (ieee->dev, -"Authentication respose status code 0x%x" , - errcode); +"Authentication respose status code 0x%x" , errcode);rtllib_associate_abort (ieee); +return ; + } + +if (ieee->open_wep || !challenge) { + ieee->state =RTLLIB_ASSOCIATING_AUTHENTICATED ; + ieee->softmac_stats.rx_auth_rs_ok++; +if (!(ieee->pHTInfo->IOTAction & +HT_IOT_ACT_PURE_N_MODE )) { +if (!ieee->GetNmodeSupportBySecCfg (ieee->dev)) { +if (IsHTHalfNmodeAPs (ieee)) { + bSupportNmode = true; + bHalfSupportNmode = true; + }else { + bSupportNmode = false; + bHalfSupportNmode = false; + } + } + } +/* Dummy wirless mode setting to avoid +* encryption issue */ +if (bSupportNmode) { + ieee->SetWirelessMode (ieee->dev, + ieee->current_network.mode); + }else { +/*TODO*/ + ieee->SetWirelessMode (ieee->dev, +IEEE_G ); + } + +if (ieee->current_network.mode == +IEEE_N_24G && bHalfSupportNmode) { +netdev_info (ieee->dev, +"======>enter half N mode\n" ); + ieee->bHalfWirelessN24GMode = + true; + }else + ieee->bHalfWirelessN24GMode = + false; + +rtllib_associate_step2 (ieee); + }else { +rtllib_auth_challenge (ieee, challenge, + chlen); } }
Signature · 1 line
1.8.4.1
PATCH v2 11/13 staging: rtl8192e: Fix indentation in rtllib_rx_auth_resp()
In reply to Mateusz Kulikowski--- drivers/staging/rtl8192e/rtllib_softmac.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +12 -18
@@ -2329,7 +2329,7 @@ static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb) errcode);netdev_info (ieee->dev, -"Authentication respose status code 0x%x" , errcode); +"Authentication respose status code 0x%x" , errcode);rtllib_associate_abort (ieee);return ; }
@@ -2337,8 +2337,7 @@ static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb)if (ieee->open_wep || !challenge) { ieee->state =RTLLIB_ASSOCIATING_AUTHENTICATED ; ieee->softmac_stats.rx_auth_rs_ok++; -if (!(ieee->pHTInfo->IOTAction & -HT_IOT_ACT_PURE_N_MODE )) { +if (!(ieee->pHTInfo->IOTAction &HT_IOT_ACT_PURE_N_MODE )) {if (!ieee->GetNmodeSupportBySecCfg (ieee->dev)) {if (IsHTHalfNmodeAPs (ieee)) { bSupportNmode = true;
@@ -2353,27 +2352,22 @@ static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb)* encryption issue */ if (bSupportNmode) { ieee->SetWirelessMode (ieee->dev, - ieee->current_network.mode); + ieee->current_network.mode); }else {/*TODO*/ - ieee->SetWirelessMode (ieee->dev, -IEEE_G ); + ieee->SetWirelessMode (ieee->dev,IEEE_G ); } -if (ieee->current_network.mode == -IEEE_N_24G && bHalfSupportNmode) { -netdev_info (ieee->dev, -"======>enter half N mode\n" ); - ieee->bHalfWirelessN24GMode = - true; - }else - ieee->bHalfWirelessN24GMode = - false; - +if ((ieee->current_network.mode ==IEEE_N_24G ) && + bHalfSupportNmode) { +netdev_info (ieee->dev,"======>enter half N mode\n" ); + ieee->bHalfWirelessN24GMode = true; + }else { + ieee->bHalfWirelessN24GMode = false; + }rtllib_associate_step2 (ieee); }else { -rtllib_auth_challenge (ieee, challenge, - chlen); +rtllib_auth_challenge (ieee, challenge, chlen); } }
Signature · 1 line
1.8.4.1
PATCH v2 12/13 staging: rtl8192e: Comment cleanup (style/format)
In reply to Mateusz Kulikowski- Multiline comments use "network subsystem comment style"
- Merge short multiline comments
- Remove empty comments
- Remove function name comment at the end of small (<1 screen) functions
- Reformat 802.11 data frame format to use spaces and network format
--- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 30 +-- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 5 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 3 +- drivers/staging/rtl8192e/rtllib.h | 96 ++++----- drivers/staging/rtl8192e/rtllib_crypt.c | 3 +- drivers/staging/rtl8192e/rtllib_crypt.h | 3 +- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 3 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 15 +- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 3 +- drivers/staging/rtl8192e/rtllib_rx.c | 101 +++++----- drivers/staging/rtl8192e/rtllib_softmac.c | 90 +++++---- drivers/staging/rtl8192e/rtllib_tx.c | 225 +++++++++++----------- drivers/staging/rtl8192e/rtllib_wx.c | 21 +- 16 files changed, 318 insertions(+), 289 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +1 -1
@@ -165,7 +165,7 @@ static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)static void cmpk_handle_interrupt_status (struct net_device *dev,u8 *pmsg) { -struct cmpk_intr_sta rx_intr_status;/* */ +struct cmpk_intr_sta rx_intr_status;struct r8192_priv *priv =rtllib_priv (dev);DMESG ("---> cmpk_Handle_Interrupt_Status()\n" );
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h +15 -15
@@ -33,28 +33,28 @@struct cmpk_txfb {u8 element_id;u8 length; -u8 TID:4 ;/* */ -u8 fail_reason:3 ;/* */ +u8 TID:4 ; +u8 fail_reason:3 ;u8 tok:1 ; -u8 reserve1:4 ;/* */ -u8 pkt_type:2 ;/* */ -u8 bandwidth:1 ;/* */ -u8 qos_pkt:1 ;/* */ +u8 reserve1:4 ; +u8 pkt_type:2 ; +u8 bandwidth:1 ; +u8 qos_pkt:1 ; -u8 reserve2;/* */ -u8 retry_cnt;/* */ -u16 pkt_id;/* */ +u8 reserve2; +u8 retry_cnt; +u16 pkt_id; -u16 seq_num;/* */ +u16 seq_num;u8 s_rate;u8 f_rate; -u8 s_rts_rate;/* */ -u8 f_rts_rate;/* */ -u16 pkt_length;/* */ +u8 s_rts_rate; +u8 f_rts_rate; +u16 pkt_length; -u16 reserve3;/* */ -u16 duration;/* */ +u16 reserve3; +u16 duration; };struct cmpk_intr_sta {
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +2 -2
@@ -304,7 +304,7 @@ static u32 phy_FwRFSerialRead(struct net_device *dev, }return read_nic_dword (dev,RF_DATA ); -}/* phy_FwRFSerialRead */ +} static void phy_FwRFSerialWrite(struct net_device *dev, enum rf90_radio_path eRFPath,
@@ -325,7 +325,7 @@ static void phy_FwRFSerialWrite(struct net_device *dev, }write_nic_dword (dev,QPNR , Data); -}/* phy_FwRFSerialWrite */ +}void rtl8192_phy_configmac (struct net_device *dev)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +2 -1
@@ -2332,7 +2332,8 @@ static void rtl8192_rx_normal(struct net_device *dev) goto done; new_skb =dev_alloc_skb (priv->rxbuffersize);/* if allocation of new skb failed - drop current packet -* and reuse skb */ +* and reuse skb +*/ if (unlikely (!new_skb)) goto done;
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +2 -3
@@ -1221,11 +1221,10 @@ static iw_handler r8192_wx_handlers[] = { IW_IOCTL(SIOCSIWENCODEEXT) = r8192_wx_set_enc_ext, }; -/* -* the following rule need to be following, +/* the following rule need to be following, * Odd : get (world access), * even : set (root access) -* */ +*/ static const struct iw_priv_args r8192_private_args[] = { {SIOCIWFIRSTPRIV +0x0 ,
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -1
@@ -719,7 +719,8 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,RTLLIB_DEBUG (RTLLIB_DL_HT ,"==============>%s()\n" , __func__);/* unmark bEnableHT flag here is the same reason why unmarked in -* function rtllib_softmac_new_net. WB 2008.09.10*/ +* function rtllib_softmac_new_net. WB 2008.09.10 +*/ if (pNetwork->bssht.bdSupportHT) { pHTInfo->bCurrentHTSupport = true; pHTInfo->ePeerHTSpecVer = pNetwork->bssht.bdHTSpecVer;
drivers/staging/rtl8192e/rtllib.h +49 -47
189 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_crypt.c +2 -1
@@ -87,7 +87,8 @@ void rtllib_crypt_delayed_deinit(struct lib80211_crypt_info *info,/* must not run ops->deinit() while there may be pending encrypt or * decrypt operations. Use a list of delayed deinits to avoid needing -* locking. */ +* locking. +*/ spin_lock_irqsave (info->lock, flags);list_add (&tmp->list, &info->crypt_deinit_list);
drivers/staging/rtl8192e/rtllib_crypt.h +1 -2
@@ -17,8 +17,7 @@* more details. */ -/* -* This file defines the interface to the rtllib crypto module. +/* This file defines the interface to the rtllib crypto module. */ #ifndef RTLLIB_CRYPT_H #define RTLLIB_CRYPT_H
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +2 -1
@@ -140,7 +140,8 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,* Flag (Include authentication header, M=3 (8-octet MIC), * L=1 (2-octet Dlen)) * Nonce: 0x00 | A2 | PN -* Dlen */ +* Dlen +*/ b0[0 ] =0x59 ; b0[1 ] = qc;memcpy (b0 +2 , hdr->addr2,ETH_ALEN );
drivers/staging/rtl8192e/rtllib_crypt_tkip.c +10 -5
@@ -249,7 +249,8 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK, u16 IV16) {/* Make temporary area overlap WEP seed so that the final copy can be -* avoided on little endian hosts. */ +* avoided on little endian hosts. +*/ u16 *PPK = (u16 *) &WEPSeed[4 ];/* Step 1 - make copy of TTAK and bring in TSC */
@@ -276,7 +277,8 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,PPK [5 ] +=RotR1 (PPK [4 ]);/* Step 3 - bring in last of TK bits, assign 24-bit WEP IV value -* WEPSeed[0..2] is transmitted as WEP IV */ +* WEPSeed[0..2] is transmitted as WEP IV +*/ WEPSeed[0 ] =Hi8 (IV16 ); WEPSeed[1 ] = (Hi8 (IV16 ) |0x20 ) &0x7F ; WEPSeed[2 ] =Lo8 (IV16 );
@@ -470,7 +472,8 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)if (iv32 != tkey->rx_iv32) {/* Previously cached Phase1 result was already * lost, so it needs to be recalculated for the -* next packet. */ +* next packet. +*/ tkey->rx_phase1_done =0 ; }if (net_ratelimit ()) {
@@ -485,7 +488,8 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) }/* Update real counters only after Michael MIC verification has -* completed */ +* completed +*/ tkey->rx_iv32_new = iv32; tkey->rx_iv16_new = iv16;
@@ -639,7 +643,8 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx, }/* Update TSC counters for RX now that the packet verification has -* completed. */ +* completed. +*/ tkey->rx_iv32 = tkey->rx_iv32_new; tkey->rx_iv16 = tkey->rx_iv16_new;
drivers/staging/rtl8192e/rtllib_crypt_wep.c +2 -1
@@ -121,7 +121,8 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)/* Fluhrer, Mantin, and Shamir have reported weaknesses in the key * scheduling algorithm of RC4. At least IVs (KeyByte + 3, 0xff, N) -* can be used to speedup attacks, so avoid using them. */ +* can be used to speedup attacks, so avoid using them. +*/ if ((wep->iv &0xff00 ) ==0xff00 ) {u8 B = (wep->iv >>16 ) &0xff ;
drivers/staging/rtl8192e/rtllib_rx.c +55 -46
275 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_softmac.c +43 -47
193 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_tx.c +117 -108
299 lines not on this page · raw message
drivers/staging/rtl8192e/rtllib_wx.c +13 -8
@@ -241,7 +241,8 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, }/* Add EXTRA: Age to display seconds since last beacon/probe response -* for given network. */ +* for given network. +*/ iwe.cmd =IWEVCUSTOM ; p = custom; p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
@@ -337,7 +338,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,RTLLIB_DEBUG_WX ("Disabling encryption.\n" );/* Check all the keys to see if any are still configured, -* and if no key index was provided, de-init them all */ +* and if no key index was provided, de-init them all +*/ for (i =0 ; i <NUM_WEP_KEYS ; i++) {if (ieee->crypt_info.crypt[i] !=NULL ) {if (key_provided)
@@ -364,7 +366,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,if (*crypt !=NULL && (*crypt)->ops !=NULL &&strcmp ((*crypt)->ops->name,"R-WEP" ) !=0 ) {/* changing to use WEP; deinit previously used algorithm -* on this key */ +* on this key +*/ lib80211_crypt_delayed_deinit (&ieee->crypt_info, crypt); }
@@ -412,7 +415,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, (*crypt)->priv); sec.flags |= (1 << key);/* This ensures a key will be activated if no key is -* explicitly set */ +* explicitly set +*/ if (key == sec.active_key) sec.flags |=SEC_ACTIVE_KEY ; ieee->crypt_info.tx_keyidx = key;
@@ -451,7 +455,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, "OPEN" : "SHARED KEY");/* For now we just support WEP, so only set that security level... - * TODO: When WPA is added this is one place that needs to change */ +* TODO: When WPA is added this is one place that needs to change + */ sec.flags |=SEC_LEVEL ; sec.level =SEC_LEVEL_1 ;/* 40 and 104 bit WEP */
@@ -462,7 +467,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,* generate new IEEE 802.11 authentication which may end up in looping * with IEEE 802.1X. If your hardware requires a reset after WEP * configuration (for example... Prism2), implement the reset_port in -* the callbacks structures used to initialize the 802.11 stack. */ +* the callbacks structures used to initialize the 802.11 stack. +*/ if (ieee->reset_on_keychange && ieee->iw_mode !=IW_MODE_INFRA && ieee->reset_port && ieee->reset_port (dev)) {
@@ -791,8 +797,7 @@ int rtllib_wx_set_auth(struct rtllib_device *ieee,case IW_AUTH_CIPHER_PAIRWISE :case IW_AUTH_CIPHER_GROUP :case IW_AUTH_KEY_MGMT : -/* -* Host AP driver does not use these parameters and allows +/* Host AP driver does not use these parameters and allows * wpa_supplicant to control them internally. */ break ;
Signature · 1 line
1.8.4.1
PATCH v2 13/13 staging: rtl8192e: Remove dead code
In reply to Mateusz KulikowskiRemove commented-out code
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 3 +-- drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h | 7 ------- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 5 +---- drivers/staging/rtl8192e/rtllib_rx.c | 7 ------- drivers/staging/rtl8192e/rtllib_wx.c | 2 -- 5 files changed, 2 insertions(+), 22 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +1 -2
@@ -2195,8 +2195,7 @@ rtl8192_InitializeVariables(struct net_device *dev) priv->rtllib->softmac_features =IEEE_SOFTMAC_SCAN |IEEE_SOFTMAC_ASSOCIATE |IEEE_SOFTMAC_PROBERQ | -IEEE_SOFTMAC_PROBERS |IEEE_SOFTMAC_TX_QUEUE /* | -IEEE_SOFTMAC_BEACONS*/ ; +IEEE_SOFTMAC_PROBERS |IEEE_SOFTMAC_TX_QUEUE ; priv->rtllib->tx_headroom =sizeof (struct tx_fwinfo_8190pci );
drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h +0 -7
@@ -888,13 +888,6 @@#define bOFDMPHY0_End 0xcff#define bOFDMPHY1_End 0xdff -/*#define max debug item in each debug page -#define bMaxItem_FPGA_PHY0 0x9 -#define bMaxItem_FPGA_PHY1 0x3 -#define bMaxItem_PHY_11B 0x16 -#define bMaxItem_OFDM_PHY0 0x29 -#define bMaxItem_OFDM_PHY1 0x0 */ -#define bPMACControl 0x0#define bWMACControl 0x1#define bWNICControl 0x2
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +1 -4
@@ -120,10 +120,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, fc =le16_to_cpu (hdr->frame_ctl); a4_included = ((fc & (RTLLIB_FCTL_TODS |RTLLIB_FCTL_FROMDS )) == (RTLLIB_FCTL_TODS |RTLLIB_FCTL_FROMDS )); -/* -qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) && -(WLAN_FC_GET_STYPE(fc) & 0x08)); -*/ + qc_included = ((WLAN_FC_GET_TYPE (fc) ==RTLLIB_FTYPE_DATA ) && (WLAN_FC_GET_STYPE (fc) &0x80 )); aad_len =22 ;
drivers/staging/rtl8192e/rtllib_rx.c +0 -7
@@ -2208,13 +2208,6 @@ static inline int rtllib_network_init(struct rtllib_network *network, struct rtllib_rx_stats *stats) { - -/* -network->qos_data.active = 0; -network->qos_data.supported = 0; -network->qos_data.param_count = 0; -network->qos_data.old_param_count = 0; -*/ memset(&network->qos_data, 0, sizeof(struct rtllib_qos_data));/* Pull out fixed field data */
drivers/staging/rtl8192e/rtllib_wx.c +0 -2
@@ -113,8 +113,6 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,/* Add frequency/channel */ iwe.cmd =SIOCGIWFREQ ; -/* iwe.u.freq.m = rtllib_frequency(network->channel, network->mode); -iwe.u.freq.e = 3; */ iwe.u.freq.m = network->channel; iwe.u.freq.e =0 ; iwe.u.freq.i =0 ;
Signature · 1 line
1.8.4.1