Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8723bs: Rework 'struct _ODM_Per_Pkt_Info_' coding style.

Change the typedef'd 'struct _ODM_Per_Pkt_Info_' into
'struct odm_packet_info' and change the members to snake case in
order to meet the coding style guidelines.
Members:
* u8 DataRate -> data_rate
* u8 StationID -> station_id
* bool bPacketMatchBSSID -> bssid_match
* bool bPacketToSelf -> to_self
* bool bPacketBeacon -> is_beacon
* bool bToSelf -> (removed because it isn't used)

Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Quytelda Kahja and committed by
Greg Kroah-Hartman
3df3602a 9f534f7e

+43 -42
+7 -9
drivers/staging/rtl8723bs/hal/odm.h
··· 262 262 } ODM_PHY_INFO_T, *PODM_PHY_INFO_T; 263 263 264 264 265 - typedef struct _ODM_Per_Pkt_Info_ { 266 - /* u8 Rate; */ 267 - u8 DataRate; 268 - u8 StationID; 269 - bool bPacketMatchBSSID; 270 - bool bPacketToSelf; 271 - bool bPacketBeacon; 272 - bool bToSelf; 273 - } ODM_PACKET_INFO_T, *PODM_PACKET_INFO_T; 265 + struct odm_packet_info { 266 + u8 data_rate; 267 + u8 station_id; 268 + bool bssid_match; 269 + bool to_self; 270 + bool is_beacon; 271 + }; 274 272 275 273 276 274 typedef struct _ODM_Phy_Dbg_Info_ {
+2 -2
drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
··· 316 316 void ODM_ParsingCFO(void *pDM_VOID, void *pPktinfo_VOID, s8 *pcfotail) 317 317 { 318 318 PDM_ODM_T pDM_Odm = (PDM_ODM_T)pDM_VOID; 319 - PODM_PACKET_INFO_T pPktinfo = (PODM_PACKET_INFO_T)pPktinfo_VOID; 319 + struct odm_packet_info *pPktinfo = (struct odm_packet_info *)pPktinfo_VOID; 320 320 PCFO_TRACKING pCfoTrack = &pDM_Odm->DM_CfoTrack; 321 321 u8 i; 322 322 323 323 if (!(pDM_Odm->SupportAbility & ODM_BB_CFO_TRACKING)) 324 324 return; 325 325 326 - if (pPktinfo->StationID != 0) { 326 + if (pPktinfo->station_id != 0) { 327 327 /* 3 Update CFO report for path-A & path-B */ 328 328 /* Only paht-A and path-B have CFO tail and short CFO */ 329 329 for (i = ODM_RF_PATH_A; i <= ODM_RF_PATH_B; i++)
+13 -13
drivers/staging/rtl8723bs/hal/odm_HWConfig.c
··· 93 93 PDM_ODM_T pDM_Odm, 94 94 PODM_PHY_INFO_T pPhyInfo, 95 95 u8 *pPhyStatus, 96 - PODM_PACKET_INFO_T pPktinfo 96 + struct odm_packet_info *pPktinfo 97 97 ) 98 98 { 99 99 u8 i, Max_spatial_stream; ··· 106 106 u8 LNA_idx, VGA_idx; 107 107 PPHY_STATUS_RPT_8192CD_T pPhyStaRpt = (PPHY_STATUS_RPT_8192CD_T)pPhyStatus; 108 108 109 - isCCKrate = pPktinfo->DataRate <= DESC_RATE11M; 109 + isCCKrate = pPktinfo->data_rate <= DESC_RATE11M; 110 110 pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = -1; 111 111 pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1; 112 112 ··· 215 215 /* */ 216 216 /* (3)EVM of HT rate */ 217 217 /* */ 218 - if (pPktinfo->DataRate >= DESC_RATEMCS8 && pPktinfo->DataRate <= DESC_RATEMCS15) 218 + if (pPktinfo->data_rate >= DESC_RATEMCS8 && pPktinfo->data_rate <= DESC_RATEMCS15) 219 219 Max_spatial_stream = 2; /* both spatial stream make sense */ 220 220 else 221 221 Max_spatial_stream = 1; /* only spatial stream 1 makes sense */ ··· 267 267 } 268 268 269 269 static void odm_Process_RSSIForDM( 270 - PDM_ODM_T pDM_Odm, PODM_PHY_INFO_T pPhyInfo, PODM_PACKET_INFO_T pPktinfo 270 + PDM_ODM_T pDM_Odm, PODM_PHY_INFO_T pPhyInfo, struct odm_packet_info *pPktinfo 271 271 ) 272 272 { 273 273 ··· 279 279 PSTA_INFO_T pEntry; 280 280 281 281 282 - if (pPktinfo->StationID == 0xFF) 282 + if (pPktinfo->station_id == 0xFF) 283 283 return; 284 284 285 - pEntry = pDM_Odm->pODM_StaInfo[pPktinfo->StationID]; 285 + pEntry = pDM_Odm->pODM_StaInfo[pPktinfo->station_id]; 286 286 287 287 if (!IS_STA_VALID(pEntry)) 288 288 return; 289 289 290 - if ((!pPktinfo->bPacketMatchBSSID)) 290 + if ((!pPktinfo->bssid_match)) 291 291 return; 292 292 293 - if (pPktinfo->bPacketBeacon) 293 + if (pPktinfo->is_beacon) 294 294 pDM_Odm->PhyDbgInfo.NumQryBeaconPkt++; 295 295 296 - isCCKrate = ((pPktinfo->DataRate <= DESC_RATE11M)) ? true : false; 297 - pDM_Odm->RxRate = pPktinfo->DataRate; 296 + isCCKrate = ((pPktinfo->data_rate <= DESC_RATE11M)) ? true : false; 297 + pDM_Odm->RxRate = pPktinfo->data_rate; 298 298 299 299 /* Statistic for antenna/path diversity------------------ */ 300 300 if (pDM_Odm->SupportAbility & ODM_BB_ANT_DIV) { ··· 307 307 UndecoratedSmoothedOFDM = pEntry->rssi_stat.UndecoratedSmoothedOFDM; 308 308 UndecoratedSmoothedPWDB = pEntry->rssi_stat.UndecoratedSmoothedPWDB; 309 309 310 - if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) { 310 + if (pPktinfo->to_self || pPktinfo->is_beacon) { 311 311 312 312 if (!isCCKrate) { /* ofdm rate */ 313 313 if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B] == 0) { ··· 424 424 PDM_ODM_T pDM_Odm, 425 425 PODM_PHY_INFO_T pPhyInfo, 426 426 u8 *pPhyStatus, 427 - PODM_PACKET_INFO_T pPktinfo 427 + struct odm_packet_info *pPktinfo 428 428 ) 429 429 { 430 430 ··· 438 438 PDM_ODM_T pDM_Odm, 439 439 PODM_PHY_INFO_T pPhyInfo, 440 440 u8 *pPhyStatus, 441 - PODM_PACKET_INFO_T pPktinfo 441 + struct odm_packet_info *pPktinfo 442 442 ) 443 443 { 444 444
+1 -1
drivers/staging/rtl8723bs/hal/odm_HWConfig.h
··· 133 133 PDM_ODM_T pDM_Odm, 134 134 PODM_PHY_INFO_T pPhyInfo, 135 135 u8 *pPhyStatus, 136 - PODM_PACKET_INFO_T pPktinfo 136 + struct odm_packet_info *pPktinfo 137 137 ); 138 138 139 139 HAL_STATUS ODM_ConfigRFWithTxPwrTrackHeaderFile(PDM_ODM_T pDM_Odm);
+20 -17
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
··· 97 97 u8 *rx_bssid; 98 98 u8 *rx_ra; 99 99 u8 *my_hwaddr; 100 - 101 - ODM_PACKET_INFO_T pkt_info; 102 100 u8 *sa = NULL; 101 + 102 + struct odm_packet_info pkt_info = { 103 + .data_rate = 0x00, 104 + .station_id = 0x00, 105 + .bssid_match = false, 106 + .to_self = false, 107 + .is_beacon = false, 108 + }; 109 + 103 110 /* _irqL irqL; */ 104 111 struct sta_priv *pstapriv; 105 112 struct sta_info *psta; 106 113 107 - pkt_info.bPacketMatchBSSID = false; 108 - pkt_info.bPacketToSelf = false; 109 - pkt_info.bPacketBeacon = false; 110 - 111 114 wlanhdr = get_recvframe_data(precvframe); 112 115 my_bssid = get_bssid(&padapter->mlmepriv); 113 116 rx_bssid = get_hdr_bssid(wlanhdr); 114 - pkt_info.bPacketMatchBSSID = ((!IsFrameTypeCtrl(wlanhdr)) && 115 - !pattrib->icv_err && !pattrib->crc_err && 116 - !ether_addr_equal(rx_bssid, my_bssid)); 117 + pkt_info.bssid_match = ((!IsFrameTypeCtrl(wlanhdr)) && 118 + !pattrib->icv_err && !pattrib->crc_err && 119 + !ether_addr_equal(rx_bssid, my_bssid)); 117 120 118 121 rx_ra = get_ra(wlanhdr); 119 122 my_hwaddr = myid(&padapter->eeprompriv); 120 - pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && 123 + pkt_info.to_self = pkt_info.bssid_match && 121 124 !ether_addr_equal(rx_ra, my_hwaddr); 122 125 123 126 124 - pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && 127 + pkt_info.is_beacon = pkt_info.bssid_match && 125 128 (GetFrameSubType(wlanhdr) == WIFI_BEACON); 126 129 127 130 sa = get_ta(wlanhdr); 128 131 129 - pkt_info.StationID = 0xFF; 132 + pkt_info.station_id = 0xFF; 130 133 131 134 pstapriv = &padapter->stapriv; 132 135 psta = rtw_get_stainfo(pstapriv, sa); 133 136 if (psta) { 134 - pkt_info.StationID = psta->mac_id; 137 + pkt_info.station_id = psta->mac_id; 135 138 /* DBG_8192C("%s ==> StationID(%d)\n", 136 - * __func__, pkt_info.StationID); */ 139 + * __func__, pkt_info.station_id); */ 137 140 } 138 - pkt_info.DataRate = pattrib->data_rate; 141 + pkt_info.data_rate = pattrib->data_rate; 139 142 140 143 /* rtl8723b_query_rx_phy_status(precvframe, pphy_status); */ 141 144 /* spin_lock_bh(&p_hal_data->odm_stainfo_lock); */ ··· 149 146 /* spin_unlock_bh(&p_hal_data->odm_stainfo_lock); */ 150 147 precvframe->u.hdr.psta = NULL; 151 148 if ( 152 - pkt_info.bPacketMatchBSSID && 149 + pkt_info.bssid_match && 153 150 (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true) 154 151 ) { 155 152 if (psta) { 156 153 precvframe->u.hdr.psta = psta; 157 154 rtl8723b_process_phy_info(padapter, precvframe); 158 155 } 159 - } else if (pkt_info.bPacketToSelf || pkt_info.bPacketBeacon) { 156 + } else if (pkt_info.to_self || pkt_info.is_beacon) { 160 157 u32 adhoc_state = WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE; 161 158 if (check_fwstate(&padapter->mlmepriv, adhoc_state)) 162 159 if (psta)