staging: rtl8192e: Series of coding style changes
Another attempt at cleaning up some of the coding style issues with this file.
PATCH v5 1/8 staging: rtl8192e: Add and remove blank lines - Coding style
Simple addition & removal of blank lines as required
--- .../rtl8192u/ieee80211/rtl819x_HTProc.c | 64 +++++-------------- 1 file changed, 16 insertions(+), 48 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +16 -48
@@ -111,9 +111,8 @@ void HTUpdateDefaultSetting(struct ieee80211_device *ieee) pHTInfo->UsbRxFwAggrPacketNum =8 ; pHTInfo->UsbRxFwAggrTimeout =16 ;////usb rx FW aggregation timeout threshold.It's in units of 64us #endif - - } +/******************************************************************************************************************** *function: This function print out each field on HT capability IE mainly from (Beacon/ProbeRsp/AssocReq) * input: u8* CapIE //Capability IE to be printed out
@@ -124,7 +123,6 @@ void HTUpdateDefaultSetting(struct ieee80211_device *ieee)* *****************************************************************************************************************/ void HTDebugHTCapability (u8 *CapIE,u8 *TitleString) { -static u8 EWC11NHTCap[] = {0x00 ,0x90 ,0x4c ,0x33 };// For 11n EWC definition, 2007.07.17, by Emily PHT_CAPABILITY_ELE pCapELE;
@@ -148,8 +146,8 @@ void HTDebugHTCapability(u8 *CapIE, u8 *TitleString)IEEE80211_DEBUG (IEEE80211_DL_HT ,"\tMCS Rate Set = [%x][%x][%x][%x][%x]\n" , pCapELE->MCS[0 ],\ pCapELE->MCS[1 ], pCapELE->MCS[2 ], pCapELE->MCS[3 ], pCapELE->MCS[4 ]);return ; - } +/******************************************************************************************************************** *function: This function print out each field on HT Information IE mainly from (Beacon/ProbeRsp) * input: u8* InfoIE //Capability IE to be printed out
@@ -160,7 +158,6 @@ void HTDebugHTCapability(u8 *CapIE, u8 *TitleString)* *****************************************************************************************************************/ void HTDebugHTInfo (u8 *InfoIE,u8 *TitleString) { -static u8 EWC11NHTInfo[] = {0x00 ,0x90 ,0x4c ,0x34 };// For 11n EWC definition, 2007.07.17, by Emily PHT_INFORMATION_ELE pHTInfoEle;
@@ -261,7 +258,6 @@ static bool IsHTHalfNmodeSGI(struct ieee80211_device *ieee, bool is40MHz)u16 HTHalfMcsToDataRate (struct ieee80211_device *ieee,u8 nMcsRate) { -u8 is40MHz;u8 isShortGI;
@@ -271,7 +267,6 @@ u16 HTHalfMcsToDataRate(struct ieee80211_device *ieee, u8 nMcsRate)return MCS_DATA_RATE [is40MHz][isShortGI][(nMcsRate&0x7f )]; } -u16 HTMcsToDataRate (struct ieee80211_device *ieee,u8 nMcsRate) {PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
@@ -326,12 +321,11 @@ u16 TxCountToDataRate(struct ieee80211_device *ieee, u8 nDataRate) } } - -bool IsHTHalfNmodeAPs (struct ieee80211_device *ieee) {bool retValue = false;struct ieee80211_network *net = &ieee->current_network; + if ((memcmp(net->bssid, BELKINF5D8233V1_RALINK, 3) == 0) || (memcmp(net->bssid, BELKINF5D82334V3_RALINK, 3) == 0) || (memcmp(net->bssid, PCI_RALINK, 3) == 0) ||
@@ -364,6 +358,7 @@ static void HTIOTPeerDetermine(struct ieee80211_device *ieee) {PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;struct ieee80211_network *net = &ieee->current_network; +if (net->bssht.bdRT2RTAggregation) pHTInfo->IOTPeer =HT_IOT_PEER_REALTEK ;else if (net->broadcom_cap_exist)
@@ -389,6 +384,7 @@ static void HTIOTPeerDetermine(struct ieee80211_device *ieee)IEEE80211_DEBUG (IEEE80211_DL_IOT ,"Joseph debug!! IOTPEER: %x\n" , pHTInfo->IOTPeer); } +/******************************************************************************************************************** *function: Check whether driver should declare received rate up to MCS13 only since some chipset is not good * at receiving MCS14~15 frame from some AP.
@@ -402,7 +398,6 @@ static u8 HTIOTActIsDisableMCS14(struct ieee80211_device *ieee, u8 *PeerMacAddr)return 0 ; } -/** * Function: HTIOTActIsDisableMCS15 *
@@ -496,6 +491,7 @@ static u8 HTIOTActIsMgntUseCCK6M(struct ieee80211_network *network)static u8 HTIOTActIsCCDFsync (u8 *PeerMacAddr) {u8 retValue =0 ; +if ((memcmp (PeerMacAddr,UNKNOWN_BORADCOM ,3 ) ==0 ) || (memcmp (PeerMacAddr,LINKSYSWRT330_LINKSYSWRT300_BROADCOM ,3 ) ==0 ) || (memcmp (PeerMacAddr,LINKSYSWRT350_LINKSYSWRT150_BROADCOM ,3 ) ==0 ))
@@ -512,7 +508,6 @@ void HTResetIOTSetting( pHTInfo->IOTPeer =HT_IOT_PEER_UNKNOWN ; } -/******************************************************************************************************************** *function: Construct Capablility Element in Beacon... if HTEnable is turned on * input: struct ieee80211_device* ieee
@@ -536,13 +531,13 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, umemset (posHTCap,0 , *len);if (pHT->ePeerHTSpecVer ==HT_SPEC_VER_EWC ) {u8 EWC11NHTCap[] = {0x00 ,0x90 ,0x4c ,0x33 };// For 11n EWC definition, 2007.07.17, by Emily +memcpy (posHTCap, EWC11NHTCap,sizeof (EWC11NHTCap)); pCapELE = (PHT_CAPABILITY_ELE )&(posHTCap[4 ]); }else { pCapELE = (PHT_CAPABILITY_ELE )posHTCap; } -//HT capability info pCapELE->AdvCoding =0 ;// This feature is not supported now!! if (ieee->GetHalfNmodeSupportByAPsHandler (ieee->dev)) {
@@ -566,7 +561,6 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u pCapELE->PSMP =0 ;// Do not support now!! pCapELE->LSigTxopProtect =0 ;// Do not support now!! -//MAC HT parameters info // TODO: Nedd to take care of this part IEEE80211_DEBUG (IEEE80211_DL_HT ,"TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n" , pCapELE->ChlWidth, pCapELE->MaxAMSDUSize, pCapELE->DssCCk);
@@ -594,6 +588,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u// For RTL819X, if pairwisekey = wep/tkip, ap is ralink, we support only MCS0~7. if (ieee->GetHalfNmodeSupportByAPsHandler (ieee->dev)) {int i; +for (i =1 ; i <16 ; i++) pCapELE->MCS[i] =0 ; }
@@ -601,7 +596,6 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u//Extended HT Capability Info memset (&pCapELE->ExtHTCapInfo,0 ,2 ); -//TXBF Capabilities memset (pCapELE->TxBFCap,0 ,4 );
@@ -613,15 +607,13 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, uelse *len =26 +2 ; - -// IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA | IEEE80211_DL_HT, posHTCap, *len -2); //Print each field in detail. Driver should not print out this message by default // HTDebugHTCapability(posHTCap, (u8*)"HTConstructCapability()"); return ; - } +/******************************************************************************************************************** *function: Construct Information Element in Beacon... if HTEnable is turned on * input: struct ieee80211_device* ieee
@@ -636,6 +628,7 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *le {PRT_HIGH_THROUGHPUT pHT = ieee->pHTInfo;PHT_INFORMATION_ELE pHTInfoEle = (PHT_INFORMATION_ELE )posHTInfo; +if ((posHTInfo ==NULL ) || (pHTInfoEle ==NULL )) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"posHTInfo or pHTInfoEle can't be null in HTConstructInfoElement()\n" );return ;
@@ -661,9 +654,7 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *lememset (pHTInfoEle->BasicMSC,0 ,16 ); - *len =22 +2 ;//same above - }else {//STA should not generate High Throughput Information Element *len =0 ;
@@ -733,20 +724,14 @@ void HTConstructRT2RTAggElement(struct ieee80211_device *ieee, u8 *posRT2RTAgg,posRT2RTAgg->Octet[5] &= 0xfb; } */ -#else // Do Nothing #endif posRT2RTAgg->Length =6 ;#endif - - - - } -/******************************************************************************************************************** *function: Pick the right Rate Adaptive table to use * input: struct ieee80211_device* ieee
@@ -757,6 +742,7 @@ void HTConstructRT2RTAggElement(struct ieee80211_device *ieee, u8 *posRT2RTAgg,static u8 HT_PickMCSRate (struct ieee80211_device *ieee,u8 *pOperateMCS) {u8 i; +if (pOperateMCS ==NULL ) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pOperateMCS can't be null in HT_PickMCSRate()\n" );return false;
@@ -787,9 +773,7 @@ static u8 HT_PickMCSRate(struct ieee80211_device *ieee, u8 *pOperateMCS)//should never reach here default : -break ; - }return true;
@@ -820,6 +804,7 @@ u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSFu8 bitMap;u8 mcsRate =0 ;u8 availableMcsRate[16 ]; +if (pMCSRateSet ==NULL || pMCSFilter ==NULL ) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pMCSRateSet or pMCSFilter can't be null in HTGetHighestMCSRate()\n" );return false;
@@ -849,8 +834,6 @@ u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSFreturn (mcsRate|0x80 ); } - -/* ** **1.Filter our operation rate set with AP's rate set
@@ -863,7 +846,6 @@ u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSFstatic u8 HTFilterMCSRate (struct ieee80211_device *ieee,u8 *pSupportMCS,u8 *pOperateMCS) { -u8 i =0 ;// filter out operational rate set not supported by AP, the length of it is 16
@@ -871,7 +853,6 @@ static u8 HTFilterMCSRate(struct ieee80211_device *ieee, u8 *pSupportMCS, pOperateMCS[i] = ieee->Regdot11HTOperationalRateSet[i]&pSupportMCS[i]; } -// TODO: adjust our operational rate set according to our channel bandwidth, STBC and Antenna number // TODO: fill suggested rate adaptive rate index and give firmware info using Tx command packet
@@ -891,6 +872,7 @@ static u8 HTFilterMCSRate(struct ieee80211_device *ieee, u8 *pSupportMCS,return true; } +void HTSetConnectBwMode (struct ieee80211_device *ieee,HT_CHANNEL_WIDTH Bandwidth,HT_EXTCHNL_OFFSET Offset);void HTOnAssocRsp (struct ieee80211_device *ieee) {
@@ -924,7 +906,6 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)else pPeerHTInfo = (PHT_INFORMATION_ELE )(pHTInfo->PeerHTInfoBuf); -//////////////////////////////////////////////////////// // Configurations: ////////////////////////////////////////////////////////
@@ -957,7 +938,6 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) pHTInfo->bCurSuppCCK = pHTInfo->bRegSuppCCK && (pPeerHTCap->DssCCk ==1 ); -// // Config and configure A-MSDU setting //
@@ -969,8 +949,6 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) pHTInfo->nCurrent_AMSDU_MaxSize = nMaxAMSDUSize; else pHTInfo->nCurrent_AMSDU_MaxSize = pHTInfo->nAMSDU_MaxSize; - -// // Config A-MPDU setting //
@@ -985,7 +963,6 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor; else pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor; - }else {// Set MPDU density to 2 to Realtek AP, and set it to 0 for others // Replace MPDU factor declared in original association response frame format. 2007.08.20 by Emily
@@ -1056,9 +1033,6 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)// Config current operation mode. // pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode; - - - }void HTSetConnectBwModeCallback (struct ieee80211_device *ieee);
@@ -1103,8 +1077,6 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee) pHTInfo->CurrentMPDUDensity = pHTInfo->MPDU_Density; pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor; - -// Initialize all of the parameters related to 11n memset ((void *)(&(pHTInfo->SelfHTCap)),0 ,sizeof (pHTInfo->SelfHTCap));memset ((void *)(&(pHTInfo->SelfHTInfo)),0 ,sizeof (pHTInfo->SelfHTInfo));
@@ -1126,11 +1098,13 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee)//MCS rate initialized here {u8 *RegHTSuppRateSets = &(ieee->RegHTSuppRateSet[0 ]); + RegHTSuppRateSets[0 ] =0xFF ;//support MCS 0~7 RegHTSuppRateSets[1 ] =0xFF ;//support MCS 8~15 RegHTSuppRateSets[4 ] =0x01 ;//support MCS 32 } } +/******************************************************************************************************************** *function: initialize Bss HT structure(struct PBSS_HT) * input: PBSS_HT pBssHT //to be initialized
@@ -1140,7 +1114,6 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee)********************************************************************************************************************/ void HTInitializeBssDesc (PBSS_HT pBssHT) { - pBssHT->bdSupportHT = false;memset (pBssHT->bdHTCapBuf,0 ,sizeof (pBssHT->bdHTCapBuf)); pBssHT->bdHTCapLen =0 ;
@@ -1152,6 +1125,7 @@ void HTInitializeBssDesc(PBSS_HT pBssHT) pBssHT->bdRT2RTAggregation = false; pBssHT->bdRT2RTLongSlotTime = false; } +/******************************************************************************************************************** *function: initialize Bss HT structure(struct PBSS_HT) * input: struct ieee80211_device *ieee
@@ -1213,7 +1187,6 @@ void HTResetSelfAndSavePeerSetting(struct ieee80211_device *ieee, struct ieee802if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_ALL_2SS ; - bIOTAction =HTIOTActIsDisableEDCATurbo (ieee, pNetwork->bssid);if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_EDCA_TURBO ;
@@ -1225,8 +1198,6 @@ void HTResetSelfAndSavePeerSetting(struct ieee80211_device *ieee, struct ieee802 bIOTAction =HTIOTActIsCCDFsync (pNetwork->bssid);if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_CDD_FSYNC ; - - }else { pHTInfo->bCurrentHTSupport = false; pHTInfo->bCurrentRT2RTAggregation = false;
@@ -1234,7 +1205,6 @@ void HTResetSelfAndSavePeerSetting(struct ieee80211_device *ieee, struct ieee802 pHTInfo->IOTAction =0 ; } - }void HTUpdateSelfAndPeerSetting (struct ieee80211_device *ieee,struct ieee80211_network *pNetwork)
@@ -1287,8 +1257,6 @@ void HTSetConnectBwMode(struct ieee80211_device *ieee, HT_CHANNEL_WIDTH Bandwidtif (!pHTInfo->bRegBW40MHz)return ; - -// To reduce dummy operation // if((pHTInfo->bCurBW40MHz==false && Bandwidth==HT_CHANNEL_WIDTH_20) || // (pHTInfo->bCurBW40MHz==true && Bandwidth==HT_CHANNEL_WIDTH_20_40 && Offset==pHTInfo->CurSTAExtChnlOffset))
Signature · 1 line
2.17.0
PATCH v5 2/8 staging: rtl8192e: Addition of prefered spacing - Coding style
In reply to John WhitmoreAdded spaces around various operators, as preferred by coding style.
--- .../rtl8192u/ieee80211/rtl819x_HTProc.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +11 -11
@@ -264,7 +264,7 @@ u16 HTHalfMcsToDataRate(struct ieee80211_device *ieee, u8 nMcsRate) is40MHz = (IsHTHalfNmode40Bandwidth (ieee)) ?1 :0 ; isShortGI = (IsHTHalfNmodeSGI (ieee, is40MHz)) ?1 :0 ; -return MCS_DATA_RATE [is40MHz][isShortGI][(nMcsRate&0x7f )]; +return MCS_DATA_RATE [is40MHz][isShortGI][(nMcsRate &0x7f )]; }u16 HTMcsToDataRate (struct ieee80211_device *ieee,u8 nMcsRate)
@@ -275,7 +275,7 @@ u16 HTMcsToDataRate(struct ieee80211_device *ieee, u8 nMcsRate)u8 isShortGI = (pHTInfo->bCurBW40MHz) ? ((pHTInfo->bCurShortGI40MHz) ?1 :0 ) : ((pHTInfo->bCurShortGI20MHz) ?1 :0 ); -return MCS_DATA_RATE [is40MHz][isShortGI][(nMcsRate&0x7f )]; +return MCS_DATA_RATE [is40MHz][isShortGI][(nMcsRate &0x7f )]; }/********************************************************************************************************************
@@ -317,7 +317,7 @@ u16 TxCountToDataRate(struct ieee80211_device *ieee, u8 nDataRate)//nDataRate = nDataRate - 60; } -return MCS_DATA_RATE [is40MHz][isShortGI][nDataRate&0xf ]; +return MCS_DATA_RATE [is40MHz][isShortGI][nDataRate &0xf ]; } }
@@ -823,15 +823,15 @@ u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSFif (availableMcsRate[i] !=0 ) { bitMap = availableMcsRate[i];for (j =0 ; j <8 ; j++) { -if ((bitMap%2 ) !=0 ) { -if (HTMcsToDataRate (ieee, (8 *i+j)) >HTMcsToDataRate (ieee, mcsRate)) - mcsRate = (8 *i+j); +if ((bitMap %2 ) !=0 ) { +if (HTMcsToDataRate (ieee, (8 * i + j)) >HTMcsToDataRate (ieee, mcsRate)) + mcsRate = (8 * i + j); } bitMap >>=1 ; } } } -return (mcsRate|0x80 ); +return (mcsRate |0x80 ); }/*
@@ -850,7 +850,7 @@ static u8 HTFilterMCSRate(struct ieee80211_device *ieee, u8 *pSupportMCS,// filter out operational rate set not supported by AP, the length of it is 16 for (i =0 ; i <=15 ; i++) { - pOperateMCS[i] = ieee->Regdot11HTOperationalRateSet[i]&pSupportMCS[i]; + pOperateMCS[i] = ieee->Regdot11HTOperationalRateSet[i] & pSupportMCS[i]; }// TODO: adjust our operational rate set according to our channel bandwidth, STBC and Antenna number
@@ -909,7 +909,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)//////////////////////////////////////////////////////// // Configurations: //////////////////////////////////////////////////////// -IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_HT , pPeerHTCap,sizeof (HT_CAPABILITY_ELE )); +IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_HT , pPeerHTCap,sizeof (HT_CAPABILITY_ELE ));// IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_HT, pPeerHTInfo, sizeof(HT_INFORMATION_ELE)); // Config Supported Channel Width setting //
@@ -1303,9 +1303,9 @@ void HTSetConnectBwModeCallback(struct ieee80211_device *ieee)if (pHTInfo->bCurBW40MHz) {if (pHTInfo->CurSTAExtChnlOffset ==HT_EXTCHNL_OFFSET_UPPER ) - ieee->set_chan (ieee->dev, ieee->current_network.channel+2 ); + ieee->set_chan (ieee->dev, ieee->current_network.channel +2 );else if (pHTInfo->CurSTAExtChnlOffset ==HT_EXTCHNL_OFFSET_LOWER ) - ieee->set_chan (ieee->dev, ieee->current_network.channel-2 ); + ieee->set_chan (ieee->dev, ieee->current_network.channel -2 );else ieee->set_chan (ieee->dev, ieee->current_network.channel);
Signature · 1 line
2.17.0
PATCH v5 3/8 staging: rtl8192e: Remove unnecessary return statements - Coding style
In reply to John WhitmoreReturn statments from void functions are not required by the coding standard.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +0 -4
@@ -145,7 +145,6 @@ void HTDebugHTCapability(u8 *CapIE, u8 *TitleString)IEEE80211_DEBUG (IEEE80211_DL_HT ,"\tMPDU Density = %d\n" , pCapELE->MPDUDensity);IEEE80211_DEBUG (IEEE80211_DL_HT ,"\tMCS Rate Set = [%x][%x][%x][%x][%x]\n" , pCapELE->MCS[0 ],\ pCapELE->MCS[1 ], pCapELE->MCS[2 ], pCapELE->MCS[3 ], pCapELE->MCS[4 ]); -return ; }/********************************************************************************************************************
@@ -207,7 +206,6 @@ void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString)IEEE80211_DEBUG (IEEE80211_DL_HT ,"\tBasic MCS Rate Set = [%x][%x][%x][%x][%x]\n" , pHTInfoEle->BasicMSC[0 ],\ pHTInfoEle->BasicMSC[1 ], pHTInfoEle->BasicMSC[2 ], pHTInfoEle->BasicMSC[3 ], pHTInfoEle->BasicMSC[4 ]); -return ; }/*
@@ -611,7 +609,6 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u//Print each field in detail. Driver should not print out this message by default // HTDebugHTCapability(posHTCap, (u8*)"HTConstructCapability()"); -return ; }/********************************************************************************************************************
@@ -661,7 +658,6 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *le }//IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA | IEEE80211_DL_HT, posHTInfo, *len - 2); //HTDebugHTInfo(posHTInfo, "HTConstructInforElement"); -return ; }/*
Signature · 1 line
2.17.0
PATCH v5 4/8 staging: rtl8192e: Correct alignment of if statements - Coding Style
In reply to John WhitmoreFunction HTIOTPeerDetermine used incorrect indentation in if statements.
--- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +8 -8
@@ -362,16 +362,16 @@ static void HTIOTPeerDetermine(struct ieee80211_device *ieee)else if (net->broadcom_cap_exist) pHTInfo->IOTPeer =HT_IOT_PEER_BROADCOM ;else if ((memcmp (net->bssid,UNKNOWN_BORADCOM ,3 ) ==0 ) || - (memcmp (net->bssid,LINKSYSWRT330_LINKSYSWRT300_BROADCOM ,3 ) ==0 ) || - (memcmp (net->bssid,LINKSYSWRT350_LINKSYSWRT150_BROADCOM ,3 ) ==0 ) || - (memcmp (net->bssid, NETGEAR834Bv2_BROADCOM,3 ) ==0 )) + (memcmp (net->bssid,LINKSYSWRT330_LINKSYSWRT300_BROADCOM ,3 ) ==0 ) || + (memcmp (net->bssid,LINKSYSWRT350_LINKSYSWRT150_BROADCOM ,3 ) ==0 ) || + (memcmp (net->bssid, NETGEAR834Bv2_BROADCOM,3 ) ==0 )) pHTInfo->IOTPeer =HT_IOT_PEER_BROADCOM ;else if ((memcmp (net->bssid,BELKINF5D8233V1_RALINK ,3 ) ==0 ) || - (memcmp (net->bssid,BELKINF5D82334V3_RALINK ,3 ) ==0 ) || - (memcmp (net->bssid,PCI_RALINK ,3 ) ==0 ) || - (memcmp (net->bssid,EDIMAX_RALINK ,3 ) ==0 ) || - (memcmp (net->bssid,AIRLINK_RALINK ,3 ) ==0 ) || - net->ralink_cap_exist) + (memcmp (net->bssid,BELKINF5D82334V3_RALINK ,3 ) ==0 ) || + (memcmp (net->bssid,PCI_RALINK ,3 ) ==0 ) || + (memcmp (net->bssid,EDIMAX_RALINK ,3 ) ==0 ) || + (memcmp (net->bssid,AIRLINK_RALINK ,3 ) ==0 ) || + net->ralink_cap_exist) pHTInfo->IOTPeer =HT_IOT_PEER_RALINK ;else if (net->atheros_cap_exist) pHTInfo->IOTPeer =HT_IOT_PEER_ATHEROS ;
Signature · 1 line
2.17.0
PATCH v5 5/8 staging: rtl8192e: Remove unrequired space at start of line - Coding Style
In reply to John WhitmoreFunction HTIOTActIsDisableMCS14 contained spurious space at start of line.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +1 -1
@@ -394,7 +394,7 @@ static void HTIOTPeerDetermine(struct ieee80211_device *ieee)static u8 HTIOTActIsDisableMCS14 (struct ieee80211_device *ieee,u8 *PeerMacAddr) {return 0 ; - } +}/** * Function: HTIOTActIsDisableMCS15
Signature · 1 line
2.17.0
PATCH v5 6/8 staging: rtl8192e: Correct declaration of HTResetIOTSetting - Coding Style
In reply to John WhitmoreDeclaration of function was spread over three lines.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +1 -3
@@ -498,9 +498,7 @@ static u8 HTIOTActIsCCDFsync(u8 *PeerMacAddr)return retValue; } -void HTResetIOTSetting ( -PRT_HIGH_THROUGHPUT pHTInfo -) +void HTResetIOTSetting (PRT_HIGH_THROUGHPUT pHTInfo) { pHTInfo->IOTAction =0 ; pHTInfo->IOTPeer =HT_IOT_PEER_UNKNOWN ;
Signature · 1 line
2.17.0
PATCH v5 7/8 staging: rtl8192e: Optimise Comparison to NULL tests - Coding Style
In reply to John WhitmoreChange comparison to NULL to better adhere to coding standard.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +5 -5
@@ -520,7 +520,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, uPHT_CAPABILITY_ELE pCapELE =NULL ;//u8 bIsDeclareMCS13; -if ((posHTCap ==NULL ) || (pHT ==NULL )) { +if (!posHTCap || !pHT) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"posHTCap or pHTInfo can't be null in HTConstructCapabilityElement()\n" );return ; }
@@ -624,7 +624,7 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *lePRT_HIGH_THROUGHPUT pHT = ieee->pHTInfo;PHT_INFORMATION_ELE pHTInfoEle = (PHT_INFORMATION_ELE )posHTInfo; -if ((posHTInfo ==NULL ) || (pHTInfoEle ==NULL )) { +if (!posHTInfo || !pHTInfoEle) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"posHTInfo or pHTInfoEle can't be null in HTConstructInfoElement()\n" );return ; }
@@ -687,7 +687,7 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *le* *****************************************************************************************************************/ void HTConstructRT2RTAggElement (struct ieee80211_device *ieee,u8 *posRT2RTAgg,u8 *len) { -if (posRT2RTAgg ==NULL ) { +if (!posRT2RTAgg) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"posRT2RTAgg can't be null in HTConstructRT2RTAggElement()\n" );return ; }
@@ -737,7 +737,7 @@ static u8 HT_PickMCSRate(struct ieee80211_device *ieee, u8 *pOperateMCS) {u8 i; -if (pOperateMCS ==NULL ) { +if (!pOperateMCS) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pOperateMCS can't be null in HT_PickMCSRate()\n" );return false; }
@@ -799,7 +799,7 @@ u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSFu8 mcsRate =0 ;u8 availableMcsRate[16 ]; -if (pMCSRateSet ==NULL || pMCSFilter ==NULL ) { +if (!pMCSRateSet || !pMCSFilter) {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pMCSRateSet or pMCSFilter can't be null in HTGetHighestMCSRate()\n" );return false; }
Signature · 1 line
2.17.0
PATCH v5 8/8 staging: rtl8192e: remove unnecessary parentheses - Coding Style
In reply to John Whitmore--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +6 -6
@@ -529,7 +529,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, uu8 EWC11NHTCap[] = {0x00 ,0x90 ,0x4c ,0x33 };// For 11n EWC definition, 2007.07.17, by Emily memcpy (posHTCap, EWC11NHTCap,sizeof (EWC11NHTCap)); - pCapELE = (PHT_CAPABILITY_ELE )&(posHTCap[4 ]); + pCapELE = (PHT_CAPABILITY_ELE )&posHTCap[4 ]; }else { pCapELE = (PHT_CAPABILITY_ELE )posHTCap; }
@@ -1072,10 +1072,10 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee) pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor;// Initialize all of the parameters related to 11n -memset ((void *)(&(pHTInfo->SelfHTCap)),0 ,sizeof (pHTInfo->SelfHTCap)); -memset ((void *)(&(pHTInfo->SelfHTInfo)),0 ,sizeof (pHTInfo->SelfHTInfo)); -memset ((void *)(&(pHTInfo->PeerHTCapBuf)),0 ,sizeof (pHTInfo->PeerHTCapBuf)); -memset ((void *)(&(pHTInfo->PeerHTInfoBuf)),0 ,sizeof (pHTInfo->PeerHTInfoBuf)); +memset ((void *)(&pHTInfo->SelfHTCap),0 ,sizeof (pHTInfo->SelfHTCap)); +memset ((void *)(&pHTInfo->SelfHTInfo),0 ,sizeof (pHTInfo->SelfHTInfo)); +memset ((void *)(&pHTInfo->PeerHTCapBuf),0 ,sizeof (pHTInfo->PeerHTCapBuf)); +memset ((void *)(&pHTInfo->PeerHTInfoBuf),0 ,sizeof (pHTInfo->PeerHTInfoBuf)); pHTInfo->bSwBwInProgress = false; pHTInfo->ChnlOp =CHNLOP_NONE ;
@@ -1091,7 +1091,7 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee)//MCS rate initialized here { -u8 *RegHTSuppRateSets = &(ieee->RegHTSuppRateSet[0 ]); +u8 *RegHTSuppRateSets = &ieee->RegHTSuppRateSet[0 ]; RegHTSuppRateSets[0 ] =0xFF ;//support MCS 0~7 RegHTSuppRateSets[1 ] =0xFF ;//support MCS 8~15
Signature · 1 line
2.17.0
Greg KH
maintainerRe: [PATCH v5 8/8] staging: rtl8192e: remove unnecessary parentheses - Coding Style
Quoted 4 lines · John Whitmore
Signed-off-by John Whitmore <[email protected]>--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
I can not take patches without any changelog text at all :(
Re: [PATCH v5 8/8] staging: rtl8192e: remove unnecessary parentheses - Coding Style
Quoted 7 lines · Greg KH
Quoted 4 lines · John Whitmore
Signed-off-by John Whitmore <[email protected]>--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)I can not take patches without any changelog text at all :(
Sorry I created a one line commit message, which became the subject of the patch email. I couldn't think of anything more to add for a second line. My mistake. I did an ammend of that, as it was the last commit, to add a second line.
Now I'm probably going to get this next bit wrong. Can I simply bump the version of patch 8/8 to v6 and resend that single patch file, or bump all 8 patches to v6 and resend all of them? I'll bump the last patch file and attach it to this email, hope for the best.
Quoted 1 line
From
4d01cfb7d18e507b163a25a69938f323cd61e9feMon Sep 17 00:00:00 2001
From: John Whitmore <[email protected]>
Date: Sun, 3 Jun 2018 12:54:22 +0100
Subject: [PATCH v6 8/8] staging: rtl8192e: remove unnecessary parentheses -
Coding Style
Remove unneccessary parentheses - Coding Style change
--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +6 -6
@@ -529,7 +529,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, uu8 EWC11NHTCap[] = {0x00 ,0x90 ,0x4c ,0x33 };// For 11n EWC definition, 2007.07.17, by Emily memcpy (posHTCap, EWC11NHTCap,sizeof (EWC11NHTCap)); - pCapELE = (PHT_CAPABILITY_ELE )&(posHTCap[4 ]); + pCapELE = (PHT_CAPABILITY_ELE )&posHTCap[4 ]; }else { pCapELE = (PHT_CAPABILITY_ELE )posHTCap; }
@@ -1072,10 +1072,10 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee) pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor;// Initialize all of the parameters related to 11n -memset ((void *)(&(pHTInfo->SelfHTCap)),0 ,sizeof (pHTInfo->SelfHTCap)); -memset ((void *)(&(pHTInfo->SelfHTInfo)),0 ,sizeof (pHTInfo->SelfHTInfo)); -memset ((void *)(&(pHTInfo->PeerHTCapBuf)),0 ,sizeof (pHTInfo->PeerHTCapBuf)); -memset ((void *)(&(pHTInfo->PeerHTInfoBuf)),0 ,sizeof (pHTInfo->PeerHTInfoBuf)); +memset ((void *)(&pHTInfo->SelfHTCap),0 ,sizeof (pHTInfo->SelfHTCap)); +memset ((void *)(&pHTInfo->SelfHTInfo),0 ,sizeof (pHTInfo->SelfHTInfo)); +memset ((void *)(&pHTInfo->PeerHTCapBuf),0 ,sizeof (pHTInfo->PeerHTCapBuf)); +memset ((void *)(&pHTInfo->PeerHTInfoBuf),0 ,sizeof (pHTInfo->PeerHTInfoBuf)); pHTInfo->bSwBwInProgress = false; pHTInfo->ChnlOp =CHNLOP_NONE ;
@@ -1091,7 +1091,7 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee)//MCS rate initialized here { -u8 *RegHTSuppRateSets = &(ieee->RegHTSuppRateSet[0 ]); +u8 *RegHTSuppRateSets = &ieee->RegHTSuppRateSet[0 ]; RegHTSuppRateSets[0 ] =0xFF ;//support MCS 0~7 RegHTSuppRateSets[1 ] =0xFF ;//support MCS 8~15
Signature · 1 line
2.17.0
Greg KH
maintainerRe: [PATCH v5 8/8] staging: rtl8192e: remove unnecessary parentheses - Coding Style
Quoted 14 lines · John Whitmore
Quoted 7 lines · Greg KH
Quoted 4 lines · John Whitmore
Signed-off-by John Whitmore <[email protected]>--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)I can not take patches without any changelog text at all :(
Sorry I created a one line commit message, which became the subject of the patch email. I couldn't think of anything more to add for a second line. My mistake. I did an ammend of that, as it was the last commit, to add a second line.
Quoted 4 lines
Now I'm probably going to get this next bit wrong. Can I simply bump the version of patch 8/8 to v6 and resend that single patch file, or bump all 8 patches to v6 and resend all of them? I'll bump the last patch file and attach it to this email, hope for the best.
I can't take attachments, sorry.
Try resending the whole series, as a new version (v6), and all should be fine.
Note that I can't do anything with patches until the merge window closes, in 2 weeks, so don't expect a response until then.
thanks,
greg k-h