drivers: staging: rtl8192u: Fix "space required before the open parenthesis '('" errors
Subsystems (2)
PATCH 1/1 drivers: staging: rtl8192u: Fix "space required before the open parenthesis '('" errors
Fix checkpatch.pl "space required before the open parenthesis '('" errors
Signed-off-by Greg Donald <[email protected]>
--- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 97 ++++++++++------------ 1 file changed, 44 insertions(+), 53 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +44 -53
@@ -66,7 +66,7 @@ void HTUpdateDefaultSetting(struct ieee80211_device *ieee) pHTInfo->bRegBW40MHz =1 ;// CCK rate support in 40MHz channel -if (pHTInfo->bRegBW40MHz) +if (pHTInfo->bRegBW40MHz) pHTInfo->bRegSuppCCK =1 ;else pHTInfo->bRegSuppCCK = true;
@@ -82,7 +82,7 @@ void HTUpdateDefaultSetting(struct ieee80211_device *ieee)// MIMO Power Save pHTInfo->SelfMimoPs =3 ;// 0: Static Mimo Ps, 1: Dynamic Mimo Ps, 3: No Limitation, 2: Reserved(Set to 3 automatically.) -if (pHTInfo->SelfMimoPs ==2 ) +if (pHTInfo->SelfMimoPs ==2 ) pHTInfo->SelfMimoPs =3 ;// 8190 only. Assign rate operation mode to firmware ieee->bTxDisableRateFallBack =0 ;
@@ -127,8 +127,7 @@ 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; -if (!memcmp (CapIE, EWC11NHTCap,sizeof (EWC11NHTCap))) - { +if (!memcmp (CapIE, EWC11NHTCap,sizeof (EWC11NHTCap))) {//EWC IE IEEE80211_DEBUG (IEEE80211_DL_HT ,"EWC IE in %s()\n" , __func__); pCapELE = (PHT_CAPABILITY_ELE )(&CapIE[4 ]);
@@ -164,8 +163,7 @@ 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; -if (!memcmp (InfoIE, EWC11NHTInfo,sizeof (EWC11NHTInfo))) - { +if (!memcmp (InfoIE, EWC11NHTInfo,sizeof (EWC11NHTInfo))) {// Not EWC IE IEEE80211_DEBUG (IEEE80211_DL_HT ,"EWC IE in %s()\n" , __func__); pHTInfoEle = (PHT_INFORMATION_ELE )(&InfoIE[4 ]);
@@ -361,7 +359,7 @@ bool IsHTHalfNmodeAPs(struct ieee80211_device *ieee) (memcmp(net->bssid, NETGEAR834Bv2_BROADCOM, 3)==0) || (net->broadcom_cap_exist)) retValue = true; - else if(net->bssht.bdRT2RTAggregation) + else if (net->bssht.bdRT2RTAggregation) retValue = true; else retValue = false;
@@ -382,23 +380,23 @@ static void HTIOTPeerDetermine(struct ieee80211_device *ieee)struct ieee80211_network *net = &ieee->current_network;if (net->bssht.bdRT2RTAggregation) pHTInfo->IOTPeer =HT_IOT_PEER_REALTEK ; -else if (net->broadcom_cap_exist) +else if (net->broadcom_cap_exist) pHTInfo->IOTPeer =HT_IOT_PEER_BROADCOM ; -else if ((memcmp (net->bssid,UNKNOWN_BORADCOM ,3 )==0 ) || +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 ) ) pHTInfo->IOTPeer =HT_IOT_PEER_BROADCOM ; -else if ((memcmp (net->bssid,BELKINF5D8233V1_RALINK ,3 )==0 ) || +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) pHTInfo->IOTPeer =HT_IOT_PEER_RALINK ; -else if (net->atheros_cap_exist) +else if (net->atheros_cap_exist) pHTInfo->IOTPeer =HT_IOT_PEER_ATHEROS ; -else if (memcmp (net->bssid,CISCO_BROADCOM ,3 )==0 ) +else if (memcmp (net->bssid,CISCO_BROADCOM ,3 ) ==0 ) pHTInfo->IOTPeer =HT_IOT_PEER_CISCO ;else pHTInfo->IOTPeer =HT_IOT_PEER_UNKNOWN ;
@@ -555,8 +553,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, ureturn ; }memset (posHTCap,0 , *len); -if (pHT->ePeerHTSpecVer ==HT_SPEC_VER_EWC ) - { +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 ]);
@@ -609,13 +606,13 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u//Supported MCS set memcpy (pCapELE->MCS, ieee->Regdot11HTOperationalRateSet,16 ); -if (pHT->IOTAction &HT_IOT_ACT_DISABLE_MCS15 ) +if (pHT->IOTAction &HT_IOT_ACT_DISABLE_MCS15 ) pCapELE->MCS[1 ] &=0x7f ; -if (pHT->IOTAction &HT_IOT_ACT_DISABLE_MCS14 ) +if (pHT->IOTAction &HT_IOT_ACT_DISABLE_MCS14 ) pCapELE->MCS[1 ] &=0xbf ; -if (pHT->IOTAction &HT_IOT_ACT_DISABLE_ALL_2SS ) +if (pHT->IOTAction &HT_IOT_ACT_DISABLE_ALL_2SS ) pCapELE->MCS[1 ] &=0x00 ;// 2008.06.12
@@ -637,7 +634,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u//Antenna Selection Capabilities pCapELE->ASCap =0 ;//add 2 to give space for element ID and len when construct frames -if (pHT->ePeerHTSpecVer ==HT_SPEC_VER_EWC ) +if (pHT->ePeerHTSpecVer ==HT_SPEC_VER_EWC ) *len =30 +2 ;else *len =26 +2 ;
@@ -861,24 +858,21 @@ u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSFIEEE80211_DEBUG (IEEE80211_DL_ERR ,"pMCSRateSet or pMCSFilter can't be null in HTGetHighestMCSRate()\n" );return false; } -for (i=0 ; i<16 ; i++) +for (i =0 ; i <16 ; i++) availableMcsRate[i] = pMCSRateSet[i] & pMCSFilter[i]; -for (i =0 ; i <16 ; i++) - { -if (availableMcsRate[i] !=0 ) +for (i =0 ; i <16 ; i++) { +if (availableMcsRate[i] !=0 )break ; } -if (i ==16 ) +if (i ==16 )return false; -for (i =0 ; i <16 ; i++) - { +for (i =0 ; i <16 ; i++) {if (availableMcsRate[i] !=0 ) { bitMap = availableMcsRate[i]; -for (j =0 ; j <8 ; j++) - { +for (j =0 ; j <8 ; j++) {if ((bitMap%2 ) !=0 ) {if (HTMcsToDataRate (ieee, (8 *i+j)) >HTMcsToDataRate (ieee, mcsRate))
@@ -921,14 +915,14 @@ static u8 HTFilterMCSRate(struct ieee80211_device *ieee, u8 *pSupportMCS,HT_PickMCSRate (ieee, pOperateMCS);// For RTL819X, if pairwisekey = wep/tkip, we support only MCS0~7. -if (ieee->GetHalfNmodeSupportByAPsHandler (ieee->dev)) +if (ieee->GetHalfNmodeSupportByAPsHandler (ieee->dev)) pOperateMCS[1 ] =0 ;// // For RTL819X, we support only MCS0~15. // And also, we do not know how to use MCS32 now. // -for (i=2 ; i<=15 ; i++) +for (i =2 ; i <=15 ; i++) pOperateMCS[i] =0 ;return true;
@@ -956,12 +950,12 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)// HTDebugHTCapability(pHTInfo->PeerHTCapBuf,"HTOnAssocRsp_wq"); // HTDebugHTInfo(pHTInfo->PeerHTInfoBuf,"HTOnAssocRsp_wq"); // -if (!memcmp (pHTInfo->PeerHTCapBuf,EWC11NHTCap,sizeof (EWC11NHTCap))) +if (!memcmp (pHTInfo->PeerHTCapBuf, EWC11NHTCap,sizeof (EWC11NHTCap))) pPeerHTCap = (PHT_CAPABILITY_ELE )(&pHTInfo->PeerHTCapBuf[4 ]);else pPeerHTCap = (PHT_CAPABILITY_ELE )(pHTInfo->PeerHTCapBuf); -if (!memcmp (pHTInfo->PeerHTInfoBuf, EWC11NHTInfo,sizeof (EWC11NHTInfo))) +if (!memcmp (pHTInfo->PeerHTInfoBuf, EWC11NHTInfo,sizeof (EWC11NHTInfo))) pPeerHTInfo = (PHT_INFORMATION_ELE )(&pHTInfo->PeerHTInfoBuf[4 ]);else pPeerHTInfo = (PHT_INFORMATION_ELE )(pHTInfo->PeerHTInfoBuf);
@@ -1008,7 +1002,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) nMaxAMSDUSize = (pPeerHTCap->MaxAMSDUSize==0 )?3839 :7935 ; -if (pHTInfo->nAMSDU_MaxSize > nMaxAMSDUSize ) +if (pHTInfo->nAMSDU_MaxSize > nMaxAMSDUSize) pHTInfo->nCurrent_AMSDU_MaxSize = nMaxAMSDUSize;else pHTInfo->nCurrent_AMSDU_MaxSize = pHTInfo->nAMSDU_MaxSize;
@@ -1022,10 +1016,9 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)// <1> Decide AMPDU Factor // By Emily -if (!pHTInfo->bRegRT2RTAggregation) - { +if (!pHTInfo->bRegRT2RTAggregation) {// Decide AMPDU Factor according to protocol handshake -if (pHTInfo->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor) +if (pHTInfo->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor) pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor;else pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor;
@@ -1043,7 +1036,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) pHTInfo->CurrentAMPDUFactor =HT_AGG_SIZE_64K ; }else { -if (pPeerHTCap->MaxRxAMPDUFactor <HT_AGG_SIZE_32K ) +if (pPeerHTCap->MaxRxAMPDUFactor <HT_AGG_SIZE_32K ) pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor;else pHTInfo->CurrentAMPDUFactor =HT_AGG_SIZE_32K ;
@@ -1052,11 +1045,11 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)// <2> Set AMPDU Minimum MPDU Start Spacing // 802.11n 3.0 section 9.7d.3 -if (pHTInfo->MPDU_Density > pPeerHTCap->MPDUDensity) +if (pHTInfo->MPDU_Density > pPeerHTCap->MPDUDensity) pHTInfo->CurrentMPDUDensity = pHTInfo->MPDU_Density;else pHTInfo->CurrentMPDUDensity = pPeerHTCap->MPDUDensity; -if (ieee->pairwise_key_type !=KEY_TYPE_NA ) +if (ieee->pairwise_key_type !=KEY_TYPE_NA ) pHTInfo->CurrentMPDUDensity =7 ;// 8us // Force TX AMSDU
@@ -1083,7 +1076,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)// Handle Ralink AP bad MCS rate set condition. Joseph. // This fix the bug of Ralink AP. This may be removed in the future. -if (pPeerHTCap->MCS[0 ] ==0 ) +if (pPeerHTCap->MCS[0 ] ==0 ) pPeerHTCap->MCS[0 ] =0xff ;HTFilterMCSRate (ieee, pPeerHTCap->MCS, ieee->dot11HTOperationalRateSet);
@@ -1092,7 +1085,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)// Config MIMO Power Save setting // pHTInfo->PeerMimoPs = pPeerHTCap->MimoPwrSave; -if (pHTInfo->PeerMimoPs ==MIMO_PS_STATIC ) +if (pHTInfo->PeerMimoPs ==MIMO_PS_STATIC ) pMcsFilter =MCS_FILTER_1SS ;else pMcsFilter =MCS_FILTER_ALL ;
@@ -1237,8 +1230,7 @@ void HTResetSelfAndSavePeerSetting(struct ieee80211_device *ieee, struct ieee802memcpy (pHTInfo->PeerHTInfoBuf, pNetwork->bssht.bdHTInfoBuf, pNetwork->bssht.bdHTInfoLen);// Check whether RT to RT aggregation mode is enabled -if (pHTInfo->bRegRT2RTAggregation) - { +if (pHTInfo->bRegRT2RTAggregation) { pHTInfo->bCurrentRT2RTAggregation = pNetwork->bssht.bdRT2RTAggregation; pHTInfo->bCurrentRT2RTLongSlotTime = pNetwork->bssht.bdRT2RTLongSlotTime; }
@@ -1255,28 +1247,28 @@ void HTResetSelfAndSavePeerSetting(struct ieee80211_device *ieee, struct ieee802// Must be called after the parameter of pHTInfo->bCurrentRT2RTAggregation is decided pHTInfo->IOTAction =0 ; bIOTAction =HTIOTActIsDisableMCS14 (ieee, pNetwork->bssid); -if (bIOTAction) +if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_MCS14 ; bIOTAction =HTIOTActIsDisableMCS15 (ieee); -if (bIOTAction) +if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_MCS15 ; bIOTAction =HTIOTActIsDisableMCSTwoSpatialStream (ieee, pNetwork->bssid); -if (bIOTAction) +if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_ALL_2SS ; bIOTAction =HTIOTActIsDisableEDCATurbo (ieee, pNetwork->bssid); -if (bIOTAction) +if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_EDCA_TURBO ; bIOTAction =HTIOTActIsMgntUseCCK6M (pNetwork); -if (bIOTAction) +if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_MGNT_USE_CCK_6M ; bIOTAction =HTIOTActIsCCDFsync (pNetwork->bssid); -if (bIOTAction) +if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_CDD_FSYNC ;
@@ -1303,7 +1295,7 @@ void HTUpdateSelfAndPeerSetting(struct ieee80211_device *ieee, struct ieee80211_// // Config current operation mode. // -if (pNetwork->bssht.bdHTInfoLen !=0 ) +if (pNetwork->bssht.bdHTInfoLen !=0 ) pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode;//
@@ -1341,7 +1333,7 @@ void HTSetConnectBwMode(struct ieee80211_device *ieee, HT_CHANNEL_WIDTH BandwidtPRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;// u32 flags = 0; -if (pHTInfo->bRegBW40MHz == false) +if (pHTInfo->bRegBW40MHz == false)return ;
@@ -1391,9 +1383,8 @@ void HTSetConnectBwModeCallback(struct ieee80211_device *ieee)IEEE80211_DEBUG (IEEE80211_DL_HT ,"======>%s()\n" , __func__); -if (pHTInfo->bCurBW40MHz) - { -if (pHTInfo->CurSTAExtChnlOffset==HT_EXTCHNL_OFFSET_UPPER ) +if (pHTInfo->bCurBW40MHz) { +if (pHTInfo->CurSTAExtChnlOffset ==HT_EXTCHNL_OFFSET_UPPER ) 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 );
Signature · 5 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
Quoted 11 lines · Greg Donald
Fix checkpatch.pl "space required before the open parenthesis '('" errors
Signed-off-by Greg Donald <[email protected]>--- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 97 ++++++++++------------ 1 file changed, 44 insertions(+), 53 deletions(-)drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +0
-0
<snip>
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c void HTDebugHTCapability(u8 *CapIE, u8 *TitleString ) · line 130
Quoted 7 lines
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +1
-2@@ -127,8 +127,7 @@ 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; -if (!memcmp (CapIE, EWC11NHTCap,sizeof (EWC11NHTCap))) - { +if (!memcmp (CapIE, EWC11NHTCap,sizeof (EWC11NHTCap))) {
^^^^^^^
this becomes a different kind of change than what is mentioned in your commit message.
You are also adding space after ',' later in your patch. please do only one kind of change in one patch.
regards
sudip
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
Umm.. you have to fix more than one error if there's more than one error on or very near the same line you are already fixing, else checkpatch.pl complains that your patch has errors. Not to mention Greg KH has never complained:
http://git.kernel.org/cgit/linux/kernel/git/gregkh/staging.git/log/?qt=grep&q=gdonald
Quoted 28 lines · Sudip Mukherjee
Quoted 11 lines · Greg Donald
Fix checkpatch.pl "space required before the open parenthesis '('" errors
Signed-off-by Greg Donald <[email protected]>--- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 97 ++++++++++------------ 1 file changed, 44 insertions(+), 53 deletions(-)drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +0
-0<snip>
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c void HTDebugHTCapability(u8 *CapIE, u8 *TitleString ) · line 130
Quoted 7 lines
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +1
-2@@ -127,8 +127,7 @@ 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; -if (!memcmp (CapIE, EWC11NHTCap,sizeof (EWC11NHTCap))) - { +if (!memcmp (CapIE, EWC11NHTCap,sizeof (EWC11NHTCap))) {^^^^^^^this becomes a different kind of change than what is mentioned in your commit message.
You are also adding space after ',' later in your patch. please do only one kind of change in one patch.regards
sudip
Signature · 4 lines
Greg Donald -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
Quoted 7 lines · Greg Donald
Umm.. you have to fix more than one error if there's more than one error on or very near the same line you are already fixing, else checkpatch.pl complains that your patch has errors. Not to mention Greg KH has never complained:
http://git.kernel.org/cgit/linux/kernel/git/gregkh/staging.git/log/?qt=grep&q=gdonald
Actually, Greg complains about these all the time.
And here is a useless URL that you can look at: http://slashdot.org
I'm sure it supports my argument.
But seriously, he does complain about these.
regards,
dan carpenter
Quoted 1 line · Dan Carpenter
Actually, Greg complains about these all the time.
All I know is he's yet to turn away a single one of my patches.
Quoted 4 lines
And here is a useless URL that you can look at: http://slashdot.org
I'm sure it supports my argument.But seriously, he does complain about these.
I've fixed more than one error on the same line many times. My useless URL supports that fact quite well.
And I'll be perfectly happy to send 5 separate patches for 5 individual errors, all for the same line of code, if that's what will make you and Sudip stop complaining.. just as soon as you fix checkpatch.pl to know an existing error from a new one.
Signature · 1 line
Greg Donald
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): 20150624093722.GK30834@mwanda
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): 20150624144325.GL30834@mwanda
Joe Perches
maintainerPATCH 1/1 checkpatch: Fix long line messages about patch context
Changes in ("checkpatch: categorize some long line length checks") now erroneously reports long line defects in patch context.
Fix it.
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Joe Perches <[email protected]>
--- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/checkpatch.pl +1 -1
@@ -2599,7 +2599,7 @@ sub process { # if LONG_LINE is ignored, the other 2 types are also ignored # - if ($length > $max_line_length) { + if ($line =~ /^\+/ && $length > $max_line_length) { my $msg_type = "LONG_LINE"; # Check the allowed long line types first
Greg Kroah-Hartman
maintainerQuoted 30 lines · Greg Donald
Fix checkpatch.pl "space required before the open parenthesis '('" errors
Signed-off-by Greg Donald <[email protected]>--- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 97 ++++++++++------------ 1 file changed, 44 insertions(+), 53 deletions(-)drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +2
-2@@ -66,7 +66,7 @@ void HTUpdateDefaultSetting(struct ieee80211_device *ieee) pHTInfo->bRegBW40MHz =1 ;// CCK rate support in 40MHz channel -if (pHTInfo->bRegBW40MHz) +if (pHTInfo->bRegBW40MHz) pHTInfo->bRegSuppCCK =1 ;else pHTInfo->bRegSuppCCK = true;@@ -82,7 +82,7 @@ void HTUpdateDefaultSetting(struct ieee80211_device *ieee)// MIMO Power Save pHTInfo->SelfMimoPs =3 ;// 0: Static Mimo Ps, 1: Dynamic Mimo Ps, 3: No Limitation, 2: Reserved(Set to 3 automatically.) -if (pHTInfo->SelfMimoPs ==2 ) +if (pHTInfo->SelfMimoPs ==2 ) pHTInfo->SelfMimoPs =3 ;// 8190 only. Assign rate operation mode to firmware ieee->bTxDisableRateFallBack =0 ;
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c void HTDebugHTCapability(u8 *CapIE, u8 *TitleString ) · line 130
Quoted 6 lines
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +1
-2@@ -127,8 +127,7 @@ 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; -if (!memcmp (CapIE, EWC11NHTCap,sizeof (EWC11NHTCap))) - { +if (!memcmp (CapIE, EWC11NHTCap,sizeof (EWC11NHTCap))) {
Like others have pointed out, this is something different than what you are saying you are doing, please break this up into different patches.
thanks,
greg k-h