Staging: vt6656: fix brace coding style issue in 80211mgr.c This is a patch to the 80211mgr.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Timofey Trofimov <[email protected]>
PATCH 1/1 Staging: vt6656: fix brace coding style issue in 80211mgr.c This is a patch to the 80211mgr.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Timofey Trofimov <[email protected]>
--- drivers/staging/vt6656/80211mgr.c | 514 ++++++++++++++++++------------------- 1 files changed, 251 insertions(+), 263 deletions(-)
drivers/staging/vt6656/80211mgr.c +251 -263
@@ -67,8 +67,8 @@/*--------------------- Static Variables --------------------------*/ -static int msglevel =MSG_LEVEL_INFO ; -//static int msglevel =MSG_LEVEL_DEBUG; +static int msglevel =MSG_LEVEL_INFO ; +/*static int msglevel =MSG_LEVEL_DEBUG;*/ /*--------------------- Static Functions --------------------------*/
@@ -96,7 +96,7 @@ vMgrEncodeBeacon( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pqwTimestamp = (PQWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_BEACON_OFF_TS ); pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -130,7 +130,7 @@ vMgrDecodeBeacon( pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pqwTimestamp = (PQWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_BEACON_OFF_TS ); pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -138,88 +138,87 @@ vMgrDecodeBeacon( pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_BEACON_OFF_CAPINFO ); -// Information elements +/* Information elements */ pItem = (PWLAN_IE )((PBYTE )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3))) +WLAN_BEACON_OFF_SSID ); -while ( ((PBYTE )pItem) < (pFrame->pBuf + pFrame->len) ){ +while (((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) {switch (pItem->byElementID) { -case WLAN_EID_SSID : -if (pFrame->pSSID ==NULL ) - pFrame->pSSID = (PWLAN_IE_SSID )pItem; -break ; -case WLAN_EID_SUPP_RATES : -if (pFrame->pSuppRates ==NULL ) - pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; -case WLAN_EID_FH_PARMS : -//pFrame->pFHParms = (PWLAN_IE_FH_PARMS)pItem; -break ; -case WLAN_EID_DS_PARMS : -if (pFrame->pDSParms ==NULL ) - pFrame->pDSParms = (PWLAN_IE_DS_PARMS )pItem; -break ; -case WLAN_EID_CF_PARMS : -if (pFrame->pCFParms ==NULL ) - pFrame->pCFParms = (PWLAN_IE_CF_PARMS )pItem; -break ; -case WLAN_EID_IBSS_PARMS : -if (pFrame->pIBSSParms ==NULL ) - pFrame->pIBSSParms = (PWLAN_IE_IBSS_PARMS )pItem; -break ; -case WLAN_EID_TIM : -if (pFrame->pTIM ==NULL ) - pFrame->pTIM = (PWLAN_IE_TIM )pItem; -break ; - -case WLAN_EID_RSN : -if (pFrame->pRSN ==NULL ) { - pFrame->pRSN = (PWLAN_IE_RSN )pItem; - } -break ; -case WLAN_EID_RSN_WPA : -if (pFrame->pRSNWPA ==NULL ) { -if (WPAb_Is_RSN ((PWLAN_IE_RSN_EXT )pItem) == TRUE) - pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT )pItem; - } -break ; - -case WLAN_EID_ERP : -if (pFrame->pERP ==NULL ) - pFrame->pERP = (PWLAN_IE_ERP )pItem; -break ; -case WLAN_EID_EXTSUPP_RATES : -if (pFrame->pExtSuppRates ==NULL ) - pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; - -case WLAN_EID_COUNTRY ://7 -if (pFrame->pIE_Country ==NULL ) - pFrame->pIE_Country = (PWLAN_IE_COUNTRY )pItem; -break ; - -case WLAN_EID_PWR_CONSTRAINT ://32 -if (pFrame->pIE_PowerConstraint ==NULL ) - pFrame->pIE_PowerConstraint = (PWLAN_IE_PW_CONST )pItem; -break ; - -case WLAN_EID_CH_SWITCH ://37 -if (pFrame->pIE_CHSW ==NULL ) - pFrame->pIE_CHSW = (PWLAN_IE_CH_SW )pItem; -break ; - -case WLAN_EID_QUIET ://40 -if (pFrame->pIE_Quiet ==NULL ) - pFrame->pIE_Quiet = (PWLAN_IE_QUIET )pItem; -break ; - -case WLAN_EID_IBSS_DFS : -if (pFrame->pIE_IBSSDFS ==NULL ) - pFrame->pIE_IBSSDFS = (PWLAN_IE_IBSS_DFS )pItem; -break ; - -default : -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Unrecognized EID=%dd in beacon decode.\n" , pItem->byElementID); +case WLAN_EID_SSID : +if (pFrame->pSSID ==NULL ) + pFrame->pSSID = (PWLAN_IE_SSID )pItem; +break ; +case WLAN_EID_SUPP_RATES : +if (pFrame->pSuppRates ==NULL ) + pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; +case WLAN_EID_FH_PARMS : +/* pFrame->pFHParms = (PWLAN_IE_FH_PARMS)pItem; */ +break ; +case WLAN_EID_DS_PARMS : +if (pFrame->pDSParms ==NULL ) + pFrame->pDSParms = (PWLAN_IE_DS_PARMS )pItem; +break ; +case WLAN_EID_CF_PARMS : +if (pFrame->pCFParms ==NULL ) + pFrame->pCFParms = (PWLAN_IE_CF_PARMS )pItem; +break ; +case WLAN_EID_IBSS_PARMS : +if (pFrame->pIBSSParms ==NULL ) + pFrame->pIBSSParms = (PWLAN_IE_IBSS_PARMS )pItem; +break ; +case WLAN_EID_TIM : +if (pFrame->pTIM ==NULL ) + pFrame->pTIM = (PWLAN_IE_TIM )pItem; +break ; + +case WLAN_EID_RSN : +if (pFrame->pRSN ==NULL ) + pFrame->pRSN = (PWLAN_IE_RSN )pItem; +break ; +case WLAN_EID_RSN_WPA : +if (pFrame->pRSNWPA ==NULL ) { +if (WPAb_Is_RSN ((PWLAN_IE_RSN_EXT )pItem) == TRUE) + pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT )pItem; + } +break ; + +case WLAN_EID_ERP : +if (pFrame->pERP ==NULL ) + pFrame->pERP = (PWLAN_IE_ERP )pItem; +break ; +case WLAN_EID_EXTSUPP_RATES : +if (pFrame->pExtSuppRates ==NULL ) + pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; + +case WLAN_EID_COUNTRY :/* 7 */ +if (pFrame->pIE_Country ==NULL ) + pFrame->pIE_Country = (PWLAN_IE_COUNTRY )pItem; +break ; + +case WLAN_EID_PWR_CONSTRAINT :/* 32 */ +if (pFrame->pIE_PowerConstraint ==NULL ) + pFrame->pIE_PowerConstraint = (PWLAN_IE_PW_CONST )pItem; +break ; + +case WLAN_EID_CH_SWITCH :/* 37 */ +if (pFrame->pIE_CHSW ==NULL ) + pFrame->pIE_CHSW = (PWLAN_IE_CH_SW )pItem; +break ; + +case WLAN_EID_QUIET :/* 40 */ +if (pFrame->pIE_Quiet ==NULL ) + pFrame->pIE_Quiet = (PWLAN_IE_QUIET )pItem; +break ; + +case WLAN_EID_IBSS_DFS : +if (pFrame->pIE_IBSSDFS ==NULL ) + pFrame->pIE_IBSSDFS = (PWLAN_IE_IBSS_DFS )pItem; +break ; + +default : +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Unrecognized EID=%dd in beacon decode.\n" , pItem->byElementID);break ; }
@@ -295,7 +294,7 @@ vMgrEncodeDisassociation( pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwReason = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_DISASSOC_OFF_REASON ); pFrame->len =WLAN_HDR_ADDR3_LEN +WLAN_DISASSOC_OFF_REASON +sizeof (*(pFrame->pwReason));
@@ -322,7 +321,7 @@ vMgrDecodeDisassociation( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwReason = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_DISASSOC_OFF_REASON );
@@ -347,7 +346,7 @@ vMgrEncodeAssocRequest( ) { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_ASSOCREQ_OFF_CAP_INFO ); pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -376,47 +375,46 @@ vMgrDecodeAssocRequest(PWLAN_IE pItem; pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_ASSOCREQ_OFF_CAP_INFO ); pFrame->pwListenInterval = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_ASSOCREQ_OFF_LISTEN_INT ); -// Information elements +/* Information elements */ pItem = (PWLAN_IE )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_ASSOCREQ_OFF_SSID );while (((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) { -switch (pItem->byElementID){ -case WLAN_EID_SSID : -if (pFrame->pSSID ==NULL ) - pFrame->pSSID = (PWLAN_IE_SSID )pItem; -break ; -case WLAN_EID_SUPP_RATES : -if (pFrame->pSuppRates ==NULL ) - pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; - -case WLAN_EID_RSN : -if (pFrame->pRSN ==NULL ) { - pFrame->pRSN = (PWLAN_IE_RSN )pItem; - } -break ; -case WLAN_EID_RSN_WPA : -if (pFrame->pRSNWPA ==NULL ) { -if (WPAb_Is_RSN ((PWLAN_IE_RSN_EXT )pItem) == TRUE) - pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT )pItem; - } -break ; -case WLAN_EID_EXTSUPP_RATES : -if (pFrame->pExtSuppRates ==NULL ) - pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; - -default : -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Unrecognized EID=%dd in assocreq decode.\n" , - pItem->byElementID); -break ; +switch (pItem->byElementID) { +case WLAN_EID_SSID : +if (pFrame->pSSID ==NULL ) + pFrame->pSSID = (PWLAN_IE_SSID )pItem; +break ; +case WLAN_EID_SUPP_RATES : +if (pFrame->pSuppRates ==NULL ) + pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; + +case WLAN_EID_RSN : +if (pFrame->pRSN ==NULL ) + pFrame->pRSN = (PWLAN_IE_RSN )pItem; +break ; +case WLAN_EID_RSN_WPA : +if (pFrame->pRSNWPA ==NULL ) { +if (WPAb_Is_RSN ((PWLAN_IE_RSN_EXT )pItem) == TRUE) + pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT )pItem; + } +break ; +case WLAN_EID_EXTSUPP_RATES : +if (pFrame->pExtSuppRates ==NULL ) + pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; + +default : +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Unrecognized EID=%dd in assocreq decode.\n" , + pItem->byElementID); +break ; } pItem = (PWLAN_IE )(((PBYTE )pItem) +2 + pItem->len); }
@@ -441,7 +439,7 @@ vMgrEncodeAssocResponse( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_ASSOCRESP_OFF_CAP_INFO ); pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -475,7 +473,7 @@ vMgrDecodeAssocResponse( pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_ASSOCRESP_OFF_CAP_INFO ); pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -483,7 +481,7 @@ vMgrDecodeAssocResponse( pFrame->pwAid = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_ASSOCRESP_OFF_AID ); -// Information elements +/* Information elements */ pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_ASSOCRESP_OFF_SUPP_RATES );
@@ -493,8 +491,7 @@ vMgrDecodeAssocResponse(if ((((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID ==WLAN_EID_EXTSUPP_RATES )) { pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem;DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "pFrame->pExtSuppRates=[%p].\n" , pItem); - } -else { + }else { pFrame->pExtSuppRates =NULL ; }return ;
@@ -519,7 +516,7 @@ vMgrEncodeReassocRequest( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_REASSOCREQ_OFF_CAP_INFO ); pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -552,7 +549,7 @@ vMgrDecodeReassocRequest(PWLAN_IE pItem; pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_REASSOCREQ_OFF_CAP_INFO ); pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -560,42 +557,41 @@ vMgrDecodeReassocRequest( pFrame->pAddrCurrAP = (PIEEE_ADDR )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_REASSOCREQ_OFF_CURR_AP ); -// Information elements +/* Information elements */ pItem = (PWLAN_IE )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_REASSOCREQ_OFF_SSID ); -while (((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) { - -switch (pItem->byElementID){ -case WLAN_EID_SSID : -if (pFrame->pSSID ==NULL ) - pFrame->pSSID = (PWLAN_IE_SSID )pItem; -break ; -case WLAN_EID_SUPP_RATES : -if (pFrame->pSuppRates ==NULL ) - pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; - -case WLAN_EID_RSN : -if (pFrame->pRSN ==NULL ) { - pFrame->pRSN = (PWLAN_IE_RSN )pItem; - } -break ; -case WLAN_EID_RSN_WPA : -if (pFrame->pRSNWPA ==NULL ) { -if (WPAb_Is_RSN ((PWLAN_IE_RSN_EXT )pItem) == TRUE) - pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT )pItem; - } -break ; +while (((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) { -case WLAN_EID_EXTSUPP_RATES : -if (pFrame->pExtSuppRates ==NULL ) - pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; -default : -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Unrecognized EID=%dd in reassocreq decode.\n" , - pItem->byElementID); -break ; +switch (pItem->byElementID) { +case WLAN_EID_SSID : +if (pFrame->pSSID ==NULL ) + pFrame->pSSID = (PWLAN_IE_SSID )pItem; +break ; +case WLAN_EID_SUPP_RATES : +if (pFrame->pSuppRates ==NULL ) + pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; + +case WLAN_EID_RSN : +if (pFrame->pRSN ==NULL ) + pFrame->pRSN = (PWLAN_IE_RSN )pItem; +break ; +case WLAN_EID_RSN_WPA : +if (pFrame->pRSNWPA ==NULL ) { +if (WPAb_Is_RSN ((PWLAN_IE_RSN_EXT )pItem) == TRUE) + pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT )pItem; + } +break ; + +case WLAN_EID_EXTSUPP_RATES : +if (pFrame->pExtSuppRates ==NULL ) + pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; +default : +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Unrecognized EID=%dd in reassocreq decode.\n" , + pItem->byElementID); +break ; } pItem = (PWLAN_IE )(((PBYTE )pItem) +2 + pItem->len); }
@@ -646,30 +642,30 @@ vMgrDecodeProbeRequest( pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Information elements +/* Information elements */ pItem = (PWLAN_IE )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3))); -while ( ((PBYTE )pItem) < (pFrame->pBuf + pFrame->len) ) { +while (((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) {switch (pItem->byElementID) { -case WLAN_EID_SSID : -if (pFrame->pSSID ==NULL ) - pFrame->pSSID = (PWLAN_IE_SSID )pItem; -break ; +case WLAN_EID_SSID : +if (pFrame->pSSID ==NULL ) + pFrame->pSSID = (PWLAN_IE_SSID )pItem; +break ; -case WLAN_EID_SUPP_RATES : -if (pFrame->pSuppRates ==NULL ) - pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; +case WLAN_EID_SUPP_RATES : +if (pFrame->pSuppRates ==NULL ) + pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; -case WLAN_EID_EXTSUPP_RATES : -if (pFrame->pExtSuppRates ==NULL ) - pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; +case WLAN_EID_EXTSUPP_RATES : +if (pFrame->pExtSuppRates ==NULL ) + pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; -default : -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Bad EID=%dd in probereq\n" , pItem->byElementID); -break ; +default : +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Bad EID=%dd in probereq\n" , pItem->byElementID); +break ; } pItem = (PWLAN_IE )(((PBYTE )pItem) +2 + pItem->len);
@@ -697,7 +693,7 @@ vMgrEncodeProbeResponse( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pqwTimestamp = (PQWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_PROBERESP_OFF_TS ); pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -734,7 +730,7 @@ vMgrDecodeProbeResponse( pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pqwTimestamp = (PQWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_PROBERESP_OFF_TS ); pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -742,83 +738,82 @@ vMgrDecodeProbeResponse( pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_PROBERESP_OFF_CAP_INFO ); -// Information elements +/* Information elements */ pItem = (PWLAN_IE )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_PROBERESP_OFF_SSID ); -while ( ((PBYTE )pItem) < (pFrame->pBuf + pFrame->len) ) { +while (((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) {switch (pItem->byElementID) { -case WLAN_EID_SSID : -if (pFrame->pSSID ==NULL ) +case WLAN_EID_SSID : +if (pFrame->pSSID ==NULL ) pFrame->pSSID = (PWLAN_IE_SSID )pItem; -break ; -case WLAN_EID_SUPP_RATES : -if (pFrame->pSuppRates ==NULL ) +break ; +case WLAN_EID_SUPP_RATES : +if (pFrame->pSuppRates ==NULL ) pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; -case WLAN_EID_FH_PARMS : -break ; -case WLAN_EID_DS_PARMS : -if (pFrame->pDSParms ==NULL ) - pFrame->pDSParms = (PWLAN_IE_DS_PARMS )pItem; -break ; -case WLAN_EID_CF_PARMS : -if (pFrame->pCFParms ==NULL ) - pFrame->pCFParms = (PWLAN_IE_CF_PARMS )pItem; -break ; -case WLAN_EID_IBSS_PARMS : -if (pFrame->pIBSSParms ==NULL ) - pFrame->pIBSSParms = (PWLAN_IE_IBSS_PARMS )pItem; -break ; - -case WLAN_EID_RSN : -if (pFrame->pRSN ==NULL ) { - pFrame->pRSN = (PWLAN_IE_RSN )pItem; - } -break ; -case WLAN_EID_RSN_WPA : -if (pFrame->pRSNWPA ==NULL ) { -if (WPAb_Is_RSN ((PWLAN_IE_RSN_EXT )pItem) == TRUE) - pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT )pItem; - } -break ; -case WLAN_EID_ERP : -if (pFrame->pERP ==NULL ) - pFrame->pERP = (PWLAN_IE_ERP )pItem; -break ; -case WLAN_EID_EXTSUPP_RATES : -if (pFrame->pExtSuppRates ==NULL ) - pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; -break ; - -case WLAN_EID_COUNTRY ://7 -if (pFrame->pIE_Country ==NULL ) - pFrame->pIE_Country = (PWLAN_IE_COUNTRY )pItem; -break ; - -case WLAN_EID_PWR_CONSTRAINT ://32 -if (pFrame->pIE_PowerConstraint ==NULL ) - pFrame->pIE_PowerConstraint = (PWLAN_IE_PW_CONST )pItem; -break ; - -case WLAN_EID_CH_SWITCH ://37 -if (pFrame->pIE_CHSW ==NULL ) - pFrame->pIE_CHSW = (PWLAN_IE_CH_SW )pItem; -break ; - -case WLAN_EID_QUIET ://40 -if (pFrame->pIE_Quiet ==NULL ) - pFrame->pIE_Quiet = (PWLAN_IE_QUIET )pItem; -break ; - -case WLAN_EID_IBSS_DFS : -if (pFrame->pIE_IBSSDFS ==NULL ) - pFrame->pIE_IBSSDFS = (PWLAN_IE_IBSS_DFS )pItem; -break ; - -default : -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Bad EID=%dd in proberesp\n" , pItem->byElementID); -break ; +break ; +case WLAN_EID_FH_PARMS : +break ; +case WLAN_EID_DS_PARMS : +if (pFrame->pDSParms ==NULL ) + pFrame->pDSParms = (PWLAN_IE_DS_PARMS )pItem; +break ; +case WLAN_EID_CF_PARMS : +if (pFrame->pCFParms ==NULL ) + pFrame->pCFParms = (PWLAN_IE_CF_PARMS )pItem; +break ; +case WLAN_EID_IBSS_PARMS : +if (pFrame->pIBSSParms ==NULL ) + pFrame->pIBSSParms = (PWLAN_IE_IBSS_PARMS )pItem; +break ; + +case WLAN_EID_RSN : +if (pFrame->pRSN ==NULL ) + pFrame->pRSN = (PWLAN_IE_RSN )pItem; +break ; +case WLAN_EID_RSN_WPA : +if (pFrame->pRSNWPA ==NULL ) { +if (WPAb_Is_RSN ((PWLAN_IE_RSN_EXT )pItem) == TRUE) + pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT )pItem; + } +break ; +case WLAN_EID_ERP : +if (pFrame->pERP ==NULL ) + pFrame->pERP = (PWLAN_IE_ERP )pItem; +break ; +case WLAN_EID_EXTSUPP_RATES : +if (pFrame->pExtSuppRates ==NULL ) + pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; +break ; + +case WLAN_EID_COUNTRY :/* 7 */ +if (pFrame->pIE_Country ==NULL ) + pFrame->pIE_Country = (PWLAN_IE_COUNTRY )pItem; +break ; + +case WLAN_EID_PWR_CONSTRAINT :/* 32 */ +if (pFrame->pIE_PowerConstraint ==NULL ) + pFrame->pIE_PowerConstraint = (PWLAN_IE_PW_CONST )pItem; +break ; + +case WLAN_EID_CH_SWITCH :/* 37 */ +if (pFrame->pIE_CHSW ==NULL ) + pFrame->pIE_CHSW = (PWLAN_IE_CH_SW )pItem; +break ; + +case WLAN_EID_QUIET :/* 40 */ +if (pFrame->pIE_Quiet ==NULL ) + pFrame->pIE_Quiet = (PWLAN_IE_QUIET )pItem; +break ; + +case WLAN_EID_IBSS_DFS : +if (pFrame->pIE_IBSSDFS ==NULL ) + pFrame->pIE_IBSSDFS = (PWLAN_IE_IBSS_DFS )pItem; +break ; + +default : +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "Bad EID=%dd in proberesp\n" , pItem->byElementID); +break ; } pItem = (PWLAN_IE )(((PBYTE )pItem) +2 + pItem->len);
@@ -845,7 +840,7 @@ vMgrEncodeAuthen( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwAuthAlgorithm = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_AUTHEN_OFF_AUTH_ALG ); pFrame->pwAuthSequence = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -853,7 +848,6 @@ vMgrEncodeAuthen( pFrame->pwStatus = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_AUTHEN_OFF_STATUS ); pFrame->len =WLAN_HDR_ADDR3_LEN +WLAN_AUTHEN_OFF_STATUS +sizeof (*(pFrame->pwStatus)); -return ; }
@@ -878,7 +872,7 @@ vMgrDecodeAuthen( pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwAuthAlgorithm = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_AUTHEN_OFF_AUTH_ALG ); pFrame->pwAuthSequence = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -886,14 +880,12 @@ vMgrDecodeAuthen( pFrame->pwStatus = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_AUTHEN_OFF_STATUS ); -// Information elements +/* Information elements */ pItem = (PWLAN_IE )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_AUTHEN_OFF_CHALLENGE ); -if ((((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID ==WLAN_EID_CHALLENGE )) { +if ((((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID ==WLAN_EID_CHALLENGE )) pFrame->pChallenge = (PWLAN_IE_CHALLENGE )pItem; - } -return ; }
@@ -916,11 +908,10 @@ vMgrEncodeDeauthen( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwReason = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_DEAUTHEN_OFF_REASON ); pFrame->len =WLAN_HDR_ADDR3_LEN +WLAN_DEAUTHEN_OFF_REASON +sizeof (*(pFrame->pwReason)); -return ; }
@@ -943,10 +934,9 @@ vMgrDecodeDeauthen( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwReason = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_DEAUTHEN_OFF_REASON ); -return ; }
@@ -969,7 +959,7 @@ vMgrEncodeReassocResponse( { pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_REASSOCRESP_OFF_CAP_INFO ); pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -978,7 +968,6 @@ vMgrEncodeReassocResponse( + WLAN_REASSOCRESP_OFF_AID); pFrame->len =WLAN_HDR_ADDR3_LEN +WLAN_REASSOCRESP_OFF_AID +sizeof (*(pFrame->pwAid)); -return ; }
@@ -1004,7 +993,7 @@ vMgrDecodeReassocResponse( pFrame->pHdr = (PUWLAN_80211HDR )pFrame->pBuf; -// Fixed Fields +/* Fixed Fields */ pFrame->pwCapInfo = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_REASSOCRESP_OFF_CAP_INFO ); pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
@@ -1012,15 +1001,14 @@ vMgrDecodeReassocResponse( pFrame->pwAid = (PWORD )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_REASSOCRESP_OFF_AID ); -//Information elements +/* Information elements */ pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES )(WLAN_HDR_A3_DATA_PTR (&(pFrame->pHdr->sA3)) +WLAN_REASSOCRESP_OFF_SUPP_RATES ); pItem = (PWLAN_IE )(pFrame->pSuppRates); pItem = (PWLAN_IE )(((PBYTE )pItem) +2 + pItem->len); -if ((((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID ==WLAN_EID_EXTSUPP_RATES )) { +if ((((PBYTE )pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID ==WLAN_EID_EXTSUPP_RATES )) pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES )pItem; - }return ; }
Signature · 1 line
1.7.0.4
Hello Timofey,
I think the message you send should have the Signed-off-by in the body, as well as the long description of the patch.
Quoted 9 lines · Timofey Trofimov
--- drivers/staging/vt6656/80211mgr.c | 514 ++++++++++++++++++------------------- 1 files changed, 251 insertions(+), 263 deletions(-)drivers/staging/vt6656/80211mgr.c +0
-0
drivers/staging/vt6656/80211mgr.c line 72
Quoted 8 lines
drivers/staging/vt6656/80211mgr.c +2
-2@@ -67,8 +67,8 @@/*--------------------- Static Variables --------------------------*/ -static int msglevel =MSG_LEVEL_INFO ; -//static int msglevel =MSG_LEVEL_DEBUG; +static int msglevel =MSG_LEVEL_INFO ; +/*static int msglevel =MSG_LEVEL_DEBUG;*/ /*--------------------- Static Functions --------------------------*/
Here, even if the code is commented you could add the extra space, in case the code is uncommented later.
Charles.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hey,
Quoted 3 lines · Тимофей Трофимов
Hi, Charles. I understand what I did wrong and never will make this mistake mistake again. I really thought that I write this. Sorry.
P.S. This is my first patch. Does I need to resend it?
I think you should try to resend it, at least to get the subject line and body correct, you can try that by sending it only to yourself first.
I should also point out that the discussion should remain on the corresponding mailing lists.
Signature · 1 line
Charles Clément
Quoted 9 lines · Charles Clément
Hey,
Quoted 3 lines · Тимофей Трофимов
Hi, Charles. I understand what I did wrong and never will make this mistake mistake again. I really thought that I write this. Sorry.
P.S. This is my first patch. Does I need to resend it?I think you should try to resend it, at least to get the subject line and body correct, you can try that by sending it only to yourself first.
It's ok, it's a common mistake combined with a bug in git-format-patch. I can handle this just fine, don't worry about it.
thanks,
greg k-h