staging: rtl8723bs: clean up line spacing
PATCH 1/10 staging: rtl8723bs: clean up line spacing
Add or remove lines to fix coding style issues and clear checkpatch.
WARNING: Missing a blank line after declarations
CHECK: Please use a blank line after function/struct/union/enum declarations
CHECK: Please don't use multiple blank lines
--- drivers/staging/rtl8723bs/core/rtw_security.c | 29 ++++--------------- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 7 +---- .../staging/rtl8723bs/core/rtw_wlan_util.c | 12 +++++++- drivers/staging/rtl8723bs/core/rtw_xmit.c | 3 ++ 4 files changed, 20 insertions(+), 31 deletions(-)
drivers/staging/rtl8723bs/core/rtw_security.c +5 -24
@@ -1008,7 +1008,6 @@ static void shift_row(u8 *in, u8 *out) out[15 ] = in[11 ]; } -static void mix_column (u8 *in,u8 *out) {sint i;
@@ -1098,7 +1097,6 @@ static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext) } } -/************************************************/ /* construct_mic_iv() */ /* Builds the MIC IV from header fields and PN */
@@ -1145,7 +1143,6 @@ static void construct_mic_iv( mic_iv[15 ] = (unsigned char ) (payload_length %256 ); } -/************************************************/ /* construct_mic_header1() */ /* Builds the first MIC header block from */
@@ -1183,7 +1180,6 @@ static void construct_mic_header1( mic_header1[15 ] = mpdu[15 ]; } -/************************************************/ /* construct_mic_header2() */ /* Builds the last MIC header block from */
@@ -1211,7 +1207,6 @@ static void construct_mic_header2( mic_header2[6 ] =0x00 ; mic_header2[7 ] =0x00 ;/* mpdu[23]; */ -if (!qc_exists && a4_exists) {for (i =0 ; i <6 ; i++) mic_header2[8 +i] = mpdu[24 +i];/* A4 */
@@ -1277,7 +1272,6 @@ static void construct_ctr_preload( ctr_preload[15 ] = (unsigned char ) (c %256 ); } -/************************************/ /* bitwise_xor() */ /* A 128 bit, bitwise exclusive or */
@@ -1291,7 +1285,6 @@ static void bitwise_xor(u8 *ina, u8 *inb, u8 *out) } } -static sint aes_cipher (u8 *key,uint hdrlen,u8 *pframe,uint plen) {
@@ -1314,7 +1307,6 @@ static sint aes_cipher(u8 *key, uint hdrlen, frsubtype = frsubtype>>4 ; -memset ((void *)mic_iv,0 ,16 );memset ((void *)mic_header1,0 ,16 );memset ((void *)mic_header2,0 ,16 );
@@ -1377,7 +1369,6 @@ static sint aes_cipher(u8 *key, uint hdrlen,qc_exists ); - payload_remainder = plen %16 ; num_blocks = plen /16 ;
@@ -1484,7 +1475,6 @@ static sint aes_cipher(u8 *key, uint hdrlen,u32 rtw_aes_encrypt (struct adapter *padapter,u8 *pxmitframe) {/* exclude ICV */ -/*static*/ /* unsigned char message[MAX_MSG_SIZE]; */
@@ -1551,13 +1541,11 @@ static sint aes_decipher(u8 *key, uint hdrlen,u8 padded_buffer[16 ];u8 mic[8 ]; -uint frtype =GetFrameType (pframe);uint frsubtype =GetFrameSubType (pframe); frsubtype = frsubtype>>4 ; -memset ((void *)mic_iv,0 ,16 );memset ((void *)mic_header1,0 ,16 );memset ((void *)mic_header2,0 ,16 );
@@ -1603,7 +1591,6 @@ static sint aes_decipher(u8 *key, uint hdrlen, }else qc_exists =0 ; -/* now, decrypt pframe with hdrlen offset and plen long */ payload_index = hdrlen +8 ;/* 8 is for extiv */
@@ -1649,7 +1636,6 @@ static sint aes_decipher(u8 *key, uint hdrlen,if ((hdrlen + plen+8 ) <=MAX_MSG_SIZE )memcpy ((void *)message, pframe, (hdrlen + plen+8 ));/* 8 is for ext iv len */ - pn_vector[0 ] = pframe[hdrlen]; pn_vector[1 ] = pframe[hdrlen+1 ]; pn_vector[2 ] = pframe[hdrlen+4 ];
@@ -1657,8 +1643,6 @@ static sint aes_decipher(u8 *key, uint hdrlen, pn_vector[4 ] = pframe[hdrlen+6 ]; pn_vector[5 ] = pframe[hdrlen+7 ]; - - construct_mic_iv( mic_iv, qc_exists,
@@ -1682,7 +1666,6 @@ static sint aes_decipher(u8 *key, uint hdrlen,qc_exists ); - payload_remainder = (plen-8 ) %16 ; num_blocks = (plen-8 ) /16 ;
@@ -1808,14 +1791,11 @@ static sint aes_decipher(u8 *key, uint hdrlen,u32 rtw_aes_decrypt (struct adapter *padapter,u8 *precvframe) {/* exclude ICV */ -/*static*/ /* unsigned char message[MAX_MSG_SIZE]; */ -/* Intermediate Buffers */ -sint length;u8 *pframe, *prwskey;/* *payload,*iv */ struct sta_info *stainfo;
@@ -1879,7 +1859,6 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) }else prwskey = &stainfo->dot118021x_UncstKey.skey[0 ]; - length = ((union recv_frame *)precvframe)->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len; res =aes_decipher (prwskey, prxattrib->hdrlen, pframe, length);
@@ -2040,6 +2019,7 @@ const u32 Te0[256] = {0x824141c3U ,0x299999b0U ,0x5a2d2d77U ,0x1e0f0f11U , 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU, }; +const u32 Td0[256 ] = {0x51f4a750U ,0x7e416553U ,0x1a17a4c3U ,0x3a275e96U , 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
@@ -2106,6 +2086,7 @@ const u32 Td0[256] = {0x39a80171U ,0x080cb3deU ,0xd8b4e49cU ,0x6456c190U , 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U, }; +const u8 Td4s[256 ] = {0x52U ,0x09U ,0x6aU ,0xd5U ,0x30U ,0x36U ,0xa5U ,0x38U , 0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
@@ -2140,6 +2121,7 @@ const u8 Td4s[256] = {0x17U ,0x2bU ,0x04U ,0x7eU ,0xbaU ,0x77U ,0xd6U ,0x26U , 0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU, }; +const u8 rcons[] = {0x01 ,0x02 ,0x04 ,0x08 ,0x10 ,0x20 ,0x40 ,0x80 ,0x1B ,0x36 /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
@@ -2221,6 +2203,7 @@ d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3]static void *aes_encrypt_init (u8 *key,size_t len) {u32 *rk; +if (len !=16 )return NULL ; rk =rtw_malloc (AES_PRIV_SIZE );
@@ -2235,7 +2218,6 @@ static void aes_128_encrypt(void *ctx, u8 *plain, u8 *crypt)rijndaelEncrypt (ctx, plain, crypt); } -static void gf_mulx (u8 *pad) {int i, carry;
@@ -2254,7 +2236,6 @@ static void aes_encrypt_deinit(void *ctx)kfree_sensitive (ctx); } -/** * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128 * @key: 128-bit key for the hash operation
@@ -2328,7 +2309,6 @@ static int omac1_aes_128_vector(u8 *key, size_t num_elem,return 0 ; } -/** * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC) * @key: 128-bit key for the hash operation
@@ -2371,6 +2351,7 @@ u8 rtw_handle_tkip_countermeasure(struct adapter *adapter, const char *caller)if (securitypriv->btkip_countermeasure) {unsigned long passing_ms =jiffies_to_msecs (jiffies - securitypriv->btkip_countermeasure_time); +if (passing_ms >60 *1000 ) {DBG_871X_LEVEL (_drv_always_,"%s(%s) countermeasure time:%lus > 60s\n" , caller,ADPT_ARG (adapter), passing_ms/1000 );
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +1 -6
@@ -163,6 +163,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)while (phead != plist) {int i; + psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); plist =get_next (plist);
@@ -282,7 +283,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)rtw_init_recv_timer (preorder_ctrl); } -/* init for DM */ psta->rssi_stat.UndecoratedSmoothedPWDB = (-1 ); psta->rssi_stat.UndecoratedSmoothedCCK = (-1 );
@@ -297,7 +297,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) exit: -return psta; }
@@ -315,14 +314,12 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)if (!psta) goto exit; -spin_lock_bh (&psta->lock); psta->state &= ~_FW_LINKED;spin_unlock_bh (&psta->lock); pfree_sta_queue = &pstapriv->free_sta_queue; - pstaxmitpriv = &psta->sta_xmitpriv;/* list_del_init(&psta->sleep_list); */
@@ -405,7 +402,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)del_timer_sync (&preorder_ctrl->reordering_ctrl_timer); - ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;spin_lock_bh (&ppending_recvframe_queue->lock);
@@ -531,7 +527,6 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) phead = &(pstapriv->sta_hash[index]); plist =get_next (phead); -while (phead != plist) { psta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +11 -1
@@ -259,12 +259,14 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)void Save_DM_Func_Flag (struct adapter *padapter) {u8 bSaveFlag = true; +rtw_hal_set_hwreg (padapter,HW_VAR_DM_FUNC_OP , (u8 *)(&bSaveFlag)); }void Restore_DM_Func_Flag (struct adapter *padapter) {u8 bSaveFlag = false; +rtw_hal_set_hwreg (padapter,HW_VAR_DM_FUNC_OP , (u8 *)(&bSaveFlag)); }
@@ -304,6 +306,7 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)for (i =0 ; i < dvobj->iface_nums; i++) {struct adapter *iface = dvobj->padapters[i]; + cnt +=scnprintf (msg+cnt, len-cnt," [%s:" ,ADPT_ARG (iface));if (iface->mlmeextpriv.cur_channel == ch) cnt +=scnprintf (msg+cnt, len-cnt,"C" );
@@ -420,6 +423,7 @@ inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork)u16 get_beacon_interval (struct wlan_bssid_ex *bss) {__le16 val; +memcpy ((unsigned char *)&val,rtw_get_beacon_interval_from_ie (bss->IEs),2 );return le16_to_cpu (val);
@@ -493,6 +497,7 @@ void invalidate_cam_all(struct adapter *padapter)static u32 _ReadCAM (struct adapter *padapter,u32 addr) {u32 count =0 , cmd; + cmd =CAM_POLLINIG | addr;rtw_write32 (padapter,RWCAM , cmd);
@@ -503,9 +508,11 @@ static u32 _ReadCAM(struct adapter *padapter, u32 addr)return rtw_read32 (padapter,REG_CAMREAD ); } +void read_cam (struct adapter *padapter,u8 entry,u8 *get_key) {u32 j, addr, cmd; + addr = entry <<3 ;/* DBG_8192C("********* DUMP CAM Entry_#%02d***************\n", entry); */
@@ -1876,7 +1883,6 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)/* DBG_871X("%s(): (a)bcn_cnt = %d\n", __func__, pmlmeext->bcn_cnt); -for (i = 0; i<9; i++) { DBG_871X("%s():bcn_delay_cnt[%d]=%d, bcn_delay_ratio[%d]=%d\n", __func__, i,
@@ -1980,12 +1986,14 @@ void rtw_release_macid(struct adapter *padapter, struct sta_info *psta) }spin_unlock_bh (&pdvobj->lock); } +/* For 8188E RA */ u8 rtw_search_max_mac_id (struct adapter *padapter) {u8 max_mac_id =0 ;struct dvobj_priv *pdvobj =adapter_to_dvobj (padapter);int i; +spin_lock_bh (&pdvobj->lock);for (i = (NUM_STA -1 ); i >=0 ; i--) {if (pdvobj->macid[i] == true)
@@ -2111,6 +2119,7 @@ void rtw_get_current_ip_address(struct adapter *padapter, u8 *pcurrentip) pmlmeinfo->state & WIFI_FW_AP_STATE) {if (my_ip_ptr) {struct in_ifaddr *my_ifa_list = my_ip_ptr->ifa_list; +if (my_ifa_list) { ipaddress[0 ] = my_ifa_list->ifa_address &0xFF ; ipaddress[1 ] = (my_ifa_list->ifa_address >>8 ) &0xFF ;
@@ -2149,6 +2158,7 @@ void rtw_get_sec_iv(struct adapter *padapter, u8 *pcur_dot11txpn, u8 *StaAddr) pcur_dot11txpn[5], pcur_dot11txpn[6], pcur_dot11txpn[7]); } } +void rtw_set_sec_pn (struct adapter *padapter) {struct sta_info *psta;
drivers/staging/rtl8723bs/core/rtw_xmit.c +3 -0
@@ -398,6 +398,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame */* check HT op mode */ if (pattrib->ht_en) {u8 HTOpMode = pmlmeinfo->HT_protection; +if ((pmlmeext->cur_bwmode && (HTOpMode ==2 || HTOpMode ==3 )) || (!pmlmeext->cur_bwmode && HTOpMode ==3 )) { pattrib->vcs_mode =RTS_CTS ;
@@ -1003,6 +1004,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr/* Update Seq Num will be handled by f/w */ {struct sta_info *psta; + psta =rtw_get_stainfo (&padapter->stapriv, pattrib->ra);if (pattrib->psta != psta) {DBG_871X ("%s, pattrib->psta(%p) != psta(%p)\n" , __func__, pattrib->psta, psta);
@@ -1243,6 +1245,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmitstruct ieee80211_hdr *pwlanhdr;u8 MME [_MME_IE_LENGTH_];u32 ori_len; + mem_start = pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct ieee80211_hdr *)pframe;
Signature · 1 line
2.25.1
PATCH 2/10 staging: rtl8723bs: clean up braces
Add or remove braces or remove lines to fix coding style issues and clear checkpatch.
WARNING: braces {} are not necessary for single statement blocks
WARNING: braces {} are not necessary for any arm of this statement
CHECK: Unbalanced braces around else statement
CHECK: braces {} should be used on all arms of this statement
CHECK: Blank lines aren't necessary before a close brace '}'
CHECK: Blank lines aren't necessary after an open brace '{'
--- drivers/staging/rtl8723bs/core/rtw_security.c | 42 ++++++++++--------- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 11 +---- .../staging/rtl8723bs/core/rtw_wlan_util.c | 23 ++++++---- drivers/staging/rtl8723bs/core/rtw_xmit.c | 23 ++++++---- 4 files changed, 52 insertions(+), 47 deletions(-)
drivers/staging/rtl8723bs/core/rtw_security.c +23 -19
@@ -1336,8 +1336,9 @@ static sint aes_cipher(u8 *key, uint hdrlen, hdrlen +=2 ; qc_exists =1 ; - }else + }else { qc_exists =0 ; + } pn_vector[0 ] = pframe[hdrlen]; pn_vector[1 ] = pframe[hdrlen+1 ];
@@ -1393,9 +1394,9 @@ static sint aes_cipher(u8 *key, uint hdrlen,if (payload_remainder >0 ) {for (j =0 ; j <16 ; j++) padded_buffer[j] =0x00 ; -for (j =0 ; j < payload_remainder; j++) { +for (j =0 ; j < payload_remainder; j++) padded_buffer[j] = pframe[payload_index++]; - } +bitwise_xor (aes_out, padded_buffer, chain_buffer);aes128k128d (key, chain_buffer, aes_out); }
@@ -1576,20 +1577,21 @@ static sint aes_decipher(u8 *key, uint hdrlen, ((frtype|frsubtype) == WIFI_DATA_CFPOLL) || ((frtype|frsubtype) == WIFI_DATA_CFACKPOLL)) { qc_exists =1 ; -if (hdrlen !=WLAN_HDR_A3_QOS_LEN ) { +if (hdrlen !=WLAN_HDR_A3_QOS_LEN ) hdrlen +=2 ; - } + } else if ((frtype == WIFI_DATA) && /* only for data packet . add for CONFIG_IEEE80211W, none 11w also can use */ ((frsubtype == 0x08) || (frsubtype == 0x09) || (frsubtype == 0x0a) || (frsubtype == 0x0b))) { - if (hdrlen != WLAN_HDR_A3_QOS_LEN) { + if (hdrlen != WLAN_HDR_A3_QOS_LEN) hdrlen += 2; - } + qc_exists =1 ; - } else + } else { qc_exists =0 ; + }/* now, decrypt pframe with hdrlen offset and plen long */
@@ -1623,9 +1625,9 @@ static sint aes_decipher(u8 *key, uint hdrlen,for (j =0 ; j <16 ; j++) padded_buffer[j] =0x00 ; -for (j =0 ; j < payload_remainder; j++) { +for (j =0 ; j < payload_remainder; j++) padded_buffer[j] = pframe[payload_index+j]; - } +aes128k128d (key, ctr_preload, aes_out);bitwise_xor (aes_out, padded_buffer, chain_buffer);for (j =0 ; j < payload_remainder; j++)
@@ -1690,9 +1692,9 @@ static sint aes_decipher(u8 *key, uint hdrlen,if (payload_remainder >0 ) {for (j =0 ; j <16 ; j++) padded_buffer[j] =0x00 ; -for (j =0 ; j < payload_remainder; j++) { +for (j =0 ; j < payload_remainder; j++) padded_buffer[j] = message[payload_index++]; - } +bitwise_xor (aes_out, padded_buffer, chain_buffer);aes128k128d (key, chain_buffer, aes_out); }
@@ -1736,9 +1738,9 @@ static sint aes_decipher(u8 *key, uint hdrlen,for (j =0 ; j <16 ; j++) padded_buffer[j] =0x00 ; -for (j =0 ; j < payload_remainder; j++) { +for (j =0 ; j < payload_remainder; j++) padded_buffer[j] = message[payload_index+j]; - } +aes128k128d (key, ctr_preload, aes_out);bitwise_xor (aes_out, padded_buffer, chain_buffer);for (j =0 ; j < payload_remainder; j++)
@@ -1758,9 +1760,8 @@ static sint aes_decipher(u8 *key, uint hdrlen,for (j =0 ; j <16 ; j++) padded_buffer[j] =0x00 ; -for (j =0 ; j <8 ; j++) { +for (j =0 ; j <8 ; j++) padded_buffer[j] = message[j+hdrlen+8 +plen-8 ]; - }aes128k128d (key, ctr_preload, aes_out);bitwise_xor (aes_out, padded_buffer, chain_buffer);
@@ -1856,8 +1857,9 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) res = _FAIL; goto exit; } - }else + }else { prwskey = &stainfo->dot118021x_UncstKey.skey[0 ]; + } length = ((union recv_frame *)precvframe)->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len;
@@ -1941,11 +1943,13 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)if (!memcmp (mic, pframe+pattrib->pkt_len-8 ,8 )) { pmlmeext->mgnt_80211w_IPN_rx = temp_ipn; res = _SUCCESS; - }else + }else {DBG_871X ("BIP MIC error!\n" ); + } - }else + }else { res =RTW_RX_HANDLED ; + } BIP_exit:kfree (BIP_AAD );
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +1 -10
@@ -154,7 +154,6 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)int index;if (pstapriv) { -/*delete all reordering_ctrl_timer */ spin_lock_bh (&pstapriv->sta_hash_lock);for (index =0 ; index <NUM_STA ; index++) {
@@ -179,7 +178,6 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)kfree_sta_priv_lock (pstapriv);vfree (pstapriv->pallocated_stainfo_buf); - }return _SUCCESS; }
@@ -241,9 +239,8 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)/* In this case, this packet will be dropped by recv_decache function if we use the 0x00 as the default value for tid_rxseq variable. */ /* So, we initialize the tid_rxseq variable as the 0xffff. */ -for (i =0 ; i <16 ; i++) { +for (i =0 ; i <16 ; i++)memcpy (&psta->sta_recvpriv.rxcache.tid_rxseq[i], &wRxSeqInitialValue,2 ); - } RT_TRACE( _module_rtl871x_sta_mgt_c_,
@@ -292,7 +289,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)spin_unlock_bh (&(pstapriv->sta_hash_lock));/* alloc mac id for non-bc/mc station, */ rtw_alloc_macid (pstapriv->padapter, psta); - } exit:
@@ -420,7 +416,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta) }spin_unlock_bh (&ppending_recvframe_queue->lock); - }if (!(psta->state &WIFI_AP_STATE ))
@@ -496,7 +491,6 @@ void rtw_free_all_stainfo(struct adapter *padapter)if (pbcmc_stainfo != psta)rtw_free_stainfo (padapter, psta); - } }
@@ -528,7 +522,6 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) plist =get_next (phead);while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, hash_list);if ((!memcmp (psta->hwaddr, addr,ETH_ALEN )))
@@ -545,7 +538,6 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)u32 rtw_init_bcmc_stainfo (struct adapter *padapter) { -struct sta_info *psta;u32 res = _SUCCESS;NDIS_802_11_MAC_ADDRESS bcast_addr = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };
@@ -598,7 +590,6 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) match = true;break ; } - }spin_unlock_bh (&(pacl_node_q->lock));
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +14 -9
@@ -957,9 +957,10 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_if (pmlmeext->cur_channel >14 ) {if ((pregistrypriv->bw_mode &0xf0 ) >0 ) cbw40_enable =1 ; - }else + }else {if ((pregistrypriv->bw_mode &0x0f ) >0 ) cbw40_enable =1 ; + }if ((pHT_info->infos[0 ] &BIT (2 )) && cbw40_enable) { new_bwmode =CHANNEL_WIDTH_40 ;
@@ -991,8 +992,9 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_/* update HT info also */ HT_info_handler (padapter, pIE); - }else + }else { pmlmeinfo->bwmode_updated = false; + }if (true == pmlmeinfo->bwmode_updated) {struct sta_info *psta;
@@ -1521,8 +1523,9 @@ unsigned int is_ap_in_tkip(struct adapter *padapter) }return false; - }else + }else {return false; + } }int support_short_GI (struct adapter *padapter,struct HT_caps_element *pHT_caps,u8 bwmode)
@@ -1626,8 +1629,9 @@ unsigned char check_assoc_AP(u8 *pframe, uint len) }else if (!memcmp (pIE->data,AIRGOCAP_OUI ,3 )) {DBG_871X ("link to Airgo Cap\n" );return HT_IOT_PEER_AIRGO ; - }else + }else {break ; + }default :break ;
@@ -1697,23 +1701,24 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) } } -if (updateCap & cIBSS) +if (updateCap & cIBSS) {/* Filen: See 802.11-2007 p.91 */ pmlmeinfo->slotTime =NON_SHORT_SLOT_TIME ; -else { + }else {/* Filen: See 802.11-2007 p.90 */ -if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N |WIRELESS_11A |WIRELESS_11_5N |WIRELESS_11AC )) +if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N |WIRELESS_11A |WIRELESS_11_5N |WIRELESS_11AC )) { pmlmeinfo->slotTime =SHORT_SLOT_TIME ; -else if (pmlmeext->cur_wireless_mode & (WIRELESS_11G )) { + }else if (pmlmeext->cur_wireless_mode & (WIRELESS_11G )) {if ((updateCap & cShortSlotTime)/* && (!(pMgntInfo->pHTInfo->RT2RT_HT_Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */ )/* Short Slot Time */ pmlmeinfo->slotTime =SHORT_SLOT_TIME ;else /* Long Slot Time */ pmlmeinfo->slotTime =NON_SHORT_SLOT_TIME ; - }else + }else {/* B Mode */ pmlmeinfo->slotTime =NON_SHORT_SLOT_TIME ; + } }rtw_hal_set_hwreg (Adapter,HW_VAR_SLOT_TIME , &pmlmeinfo->slotTime);
drivers/staging/rtl8723bs/core/rtw_xmit.c +14 -9
@@ -366,9 +366,9 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame */* Other fragments are protected by previous fragment. */ /* So we only need to check the length of first fragment. */ if (pmlmeext->cur_wireless_mode <WIRELESS_11_24N || padapter->registrypriv.wifi_spec) { -if (sz > padapter->registrypriv.rts_thresh) +if (sz > padapter->registrypriv.rts_thresh) { pattrib->vcs_mode =RTS_CTS ; -else { + }else {if (pattrib->rtsen) pattrib->vcs_mode =RTS_CTS ;else if (pattrib->cts2self)
@@ -676,8 +676,9 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attribmemcpy (pattrib->ra, pattrib->dst,ETH_ALEN );memcpy (pattrib->ta,get_bssid (pmlmepriv),ETH_ALEN );DBG_COUNTER (padapter->tx_logs.core_tx_upd_attrib_ap); - }else + }else {DBG_COUNTER (padapter->tx_logs.core_tx_upd_attrib_unknown); + } pattrib->pktlen = pktfile.pkt_len;
@@ -923,8 +924,9 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmidefault :break ; } - }else + }else {RT_TRACE (_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n" )); + }return _SUCCESS; }
@@ -1202,8 +1204,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_framClearMFrag (mem_start);break ; - }else + }else {RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n" , __func__)); + } addr = (SIZE_PTR )(pframe);
@@ -1445,17 +1448,18 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)case AUTO_VCS :default : perp =rtw_get_ie (ie, _ERPINFO_IE_, &erp_len, ie_len); -if (!perp) +if (!perp) { pxmitpriv->vcs =NONE_VCS ; -else { + }else { protection = (*(perp +2 )) &BIT (1 );if (protection) {if (pregistrypriv->vcs_type ==RTS_CTS ) pxmitpriv->vcs =RTS_CTS ;else pxmitpriv->vcs =CTS_TO_SELF ; - }else + }else { pxmitpriv->vcs =NONE_VCS ; + } }break ;
@@ -1508,8 +1512,9 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpriv,DBG_871X ("%s pxmitbuf->sctx is not NULL\n" , __func__);rtw_sctx_done_err (&pxmitbuf->sctx,RTW_SCTX_DONE_BUF_ALLOC ); } - }else + }else {DBG_871X ("%s fail, no xmitbuf available !!!\n" , __func__); + }return pxmitbuf; }
Signature · 1 line
2.25.1
PATCH 3/10 staging: rtl8723bs: clean up space before tabs
In reply to Ross SchmidtRemove spaces before tabs to fix coding style issues and clear checkpatch warnings.
WARNING: please, no space before tabs
--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 16 +++---- drivers/staging/rtl8723bs/core/rtw_recv.c | 42 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_security.c | 44 +++++++++---------- .../staging/rtl8723bs/core/rtw_wlan_util.c | 34 +++++++------- drivers/staging/rtl8723bs/core/rtw_xmit.c | 20 ++++----- 5 files changed, 78 insertions(+), 78 deletions(-)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +8 -8
@@ -1340,8 +1340,8 @@ void rtw_ps_deny(struct adapter *padapter, enum PS_DENY_REASON reason) {struct pwrctrl_priv *pwrpriv; -/* DBG_871X("+" FUNC_ADPT_FMT ": Request PS deny for %d (0x%08X)\n", */ -/* FUNC_ADPT_ARG(padapter), reason, BIT(reason)); */ +/* DBG_871X("+" FUNC_ADPT_FMT ": Request PS deny for %d (0x%08X)\n", */ +/* FUNC_ADPT_ARG(padapter), reason, BIT(reason)); */ pwrpriv =adapter_to_pwrctl (padapter);
@@ -1353,8 +1353,8 @@ void rtw_ps_deny(struct adapter *padapter, enum PS_DENY_REASON reason) pwrpriv->ps_deny |=BIT (reason);mutex_unlock (&pwrpriv->lock); -/* DBG_871X("-" FUNC_ADPT_FMT ": Now PS deny for 0x%08X\n", */ -/* FUNC_ADPT_ARG(padapter), pwrpriv->ps_deny); */ +/* DBG_871X("-" FUNC_ADPT_FMT ": Now PS deny for 0x%08X\n", */ +/* FUNC_ADPT_ARG(padapter), pwrpriv->ps_deny); */ }/*
@@ -1366,8 +1366,8 @@ void rtw_ps_deny_cancel(struct adapter *padapter, enum PS_DENY_REASON reason)struct pwrctrl_priv *pwrpriv; -/* DBG_871X("+" FUNC_ADPT_FMT ": Cancel PS deny for %d(0x%08X)\n", */ -/* FUNC_ADPT_ARG(padapter), reason, BIT(reason)); */ +/* DBG_871X("+" FUNC_ADPT_FMT ": Cancel PS deny for %d(0x%08X)\n", */ +/* FUNC_ADPT_ARG(padapter), reason, BIT(reason)); */ pwrpriv =adapter_to_pwrctl (padapter);
@@ -1379,8 +1379,8 @@ void rtw_ps_deny_cancel(struct adapter *padapter, enum PS_DENY_REASON reason) pwrpriv->ps_deny &= ~BIT (reason);mutex_unlock (&pwrpriv->lock); -/* DBG_871X("-" FUNC_ADPT_FMT ": Now PS deny for 0x%08X\n", */ -/* FUNC_ADPT_ARG(padapter), pwrpriv->ps_deny); */ +/* DBG_871X("-" FUNC_ADPT_FMT ": Now PS deny for 0x%08X\n", */ +/* FUNC_ADPT_ARG(padapter), pwrpriv->ps_deny); */ }/*
drivers/staging/rtl8723bs/core/rtw_recv.c +21 -21
106 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_security.c +22 -22
81 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +17 -17
@@ -802,7 +802,7 @@ void WMMOnAssocRsp(struct adapter *padapter)u32 edca[4 ], inx[4 ];struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct registry_priv *pregpriv = &padapter->registrypriv; acm_mask =0 ;
@@ -937,7 +937,7 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct registry_priv *pregistrypriv = &padapter->registrypriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;u8 cbw40_enable =0 ;if (!pIE)
@@ -1030,8 +1030,8 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)u8 cur_ldpc_cap =0 , cur_stbc_cap =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;if (!pIE)return ;
@@ -1043,8 +1043,8 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)for (i =0 ; i < (pIE->Length); i++) {if (i !=2 ) { -/* Commented by Albert 2010/07/12 */ -/* Got the endian issue here. */ +/* Commented by Albert 2010/07/12 */ +/* Got the endian issue here. */ pmlmeinfo->HT_caps.u.HT_cap[i] &= (pIE->data[i]); }else {/* modify from fw by Thomas 2010/11/17 */
@@ -1113,8 +1113,8 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;if (!pIE)return ;
@@ -1131,8 +1131,8 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)void HTOnAssocRsp (struct adapter *padapter) { -unsigned char max_AMPDU_len; -unsigned char min_MPDU_spacing; +unsigned char max_AMPDU_len; +unsigned char min_MPDU_spacing;/* struct registry_priv *pregpriv = &padapter->registrypriv; */ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -1229,8 +1229,8 @@ void update_ldpc_stbc_cap(struct sta_info *psta)int rtw_check_bcn_info (struct adapter *Adapter,u8 *pframe,u32 packet_len) { -unsigned int len; -unsigned char *p; +unsigned int len; +unsigned char *p;unsigned short val16, subtype;struct wlan_network *cur_network = &(Adapter->mlmepriv.cur_network);/* u8 wpa_ie[255], rsn_ie[255]; */
@@ -1530,7 +1530,7 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)int support_short_GI (struct adapter *padapter,struct HT_caps_element *pHT_caps,u8 bwmode) { -unsigned char bit_offset; +unsigned char bit_offset;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -1604,7 +1604,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)if (pIE->Length >=5 ) {if (pIE->data[4 ] ==1 )/* if (pIE->data[5] & RT_HT_CAP_USE_LONG_PREAMBLE) */ -/* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_LONG_PREAMBLE; */ +/* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_LONG_PREAMBLE; */ if (pIE->data[5 ] &RT_HT_CAP_USE_92SE )/* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE; */ Vender =HT_IOT_PEER_REALTEK_92SE ;
@@ -1730,8 +1730,8 @@ void update_wireless_mode(struct adapter *padapter)u32 SIFS_Timer;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); -unsigned char *rate = cur_network->SupportedRates; +struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +unsigned char *rate = cur_network->SupportedRates;if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) pmlmeinfo->HT_enable =1 ;
@@ -2141,7 +2141,7 @@ void rtw_get_current_ip_address(struct adapter *padapter, u8 *pcurrentip)#ifdef CONFIG_WOWLAN void rtw_get_sec_iv (struct adapter *padapter,u8 *pcur_dot11txpn,u8 *StaAddr) { -struct sta_info *psta; +struct sta_info *psta;struct security_priv *psecpriv = &padapter->securitypriv;memset (pcur_dot11txpn,0 ,8 );
drivers/staging/rtl8723bs/core/rtw_xmit.c +10 -10
@@ -363,8 +363,8 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame */* (1) RTS_Threshold is compared to the MPDU, not MSDU. */ /* (2) If there are more than one frag in this MSDU, only the first frag uses protection frame. */ -/* Other fragments are protected by previous fragment. */ -/* So we only need to check the length of first fragment. */ +/* Other fragments are protected by previous fragment. */ +/* So we only need to check the length of first fragment. */ if (pmlmeext->cur_wireless_mode <WIRELESS_11_24N || padapter->registrypriv.wifi_spec) {if (sz > padapter->registrypriv.rts_thresh) { pattrib->vcs_mode =RTS_CTS ;
@@ -648,9 +648,9 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attribstruct ethhdr etherhdr;sint bmcast; -struct sta_priv *pstapriv = &padapter->stapriv; +struct sta_priv *pstapriv = &padapter->stapriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct qos_priv *pqospriv = &pmlmepriv->qospriv; +struct qos_priv *pqospriv = &pmlmepriv->qospriv;sint res = _SUCCESS;DBG_COUNTER (padapter->tx_logs.core_tx_upd_attrib);
@@ -812,10 +812,10 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr {sint curfragnum, length;u8 *pframe, *payload, mic[8 ]; -struct mic_data micdata; -struct pkt_attrib *pattrib = &pxmitframe->attrib; -struct security_priv *psecuritypriv = &padapter->securitypriv; -struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mic_data micdata; +struct pkt_attrib *pattrib = &pxmitframe->attrib; +struct security_priv *psecuritypriv = &padapter->securitypriv; +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;u8 priority[4 ] = {0x0 ,0x0 ,0x0 ,0x0 };u8 hw_hdr_offset =0 ;sint bmcst =IS_MCAST (pattrib->ra);
@@ -1237,8 +1237,8 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit {u8 *pframe, *mem_start =NULL , *tmp_buf =NULL ;u8 subtype; -struct sta_info *psta =NULL ; -struct pkt_attrib *pattrib = &pxmitframe->attrib; +struct sta_info *psta =NULL ; +struct pkt_attrib *pattrib = &pxmitframe->attrib;s32 bmcst =IS_MCAST (pattrib->ra);u8 *BIP_AAD =NULL ;u8 *MGMT_body =NULL ;
Signature · 1 line
2.25.1
PATCH 4/10 staging: rtl8723bs: clean up open ended lines
In reply to Ross SchmidtMove declarations to fix coding style issues and clear checkpatch checks.
CHECK: Lines should not end with a '('
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 44 +-- .../staging/rtl8723bs/core/rtw_ieee80211.c | 13 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 10 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 16 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 7 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 38 +-- drivers/staging/rtl8723bs/core/rtw_security.c | 261 ++++++------------ drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 42 ++- drivers/staging/rtl8723bs/core/rtw_xmit.c | 17 +- 9 files changed, 147 insertions(+), 301 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +7 -37
@@ -303,12 +303,7 @@ bool bPseudoTest) }/* 11/16/2008 MH Write one byte to reald Efuse. */ -u8 -efuse_OneByteWrite ( -struct adapter *padapter, -u16 addr, -u8 data, -bool bPseudoTest) +u8 efuse_OneByteWrite (struct adapter *padapter,u16 addr,u8 data,bool bPseudoTest) {u8 tmpidx =0 ;u8 bResult = false;
@@ -456,12 +451,7 @@ Efuse_ReadAllMap(u8 efuseType, u8 *Efuse, bool bPseudoTest); -void -Efuse_ReadAllMap ( -struct adapter *padapter, -u8 efuseType, -u8 *Efuse, -bool bPseudoTest) +void Efuse_ReadAllMap (struct adapter *padapter,u8 efuseType,u8 *Efuse,bool bPseudoTest) {u16 mapLen =0 ;
@@ -492,11 +482,7 @@ Efuse_ReadAllMap(* 11/12/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -static void -efuse_ShadowRead1Byte ( -struct adapter *padapter, -u16 Offset, -u8 *Value) +static void efuse_ShadowRead1Byte (struct adapter *padapter,u16 Offset,u8 *Value) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter);
@@ -505,11 +491,7 @@ u16 Offset, }/* EFUSE_ShadowRead1Byte */ /* Read Two Bytes */ -static void -efuse_ShadowRead2Byte ( -struct adapter *padapter, -u16 Offset, -u16 *Value) +static void efuse_ShadowRead2Byte (struct adapter *padapter,u16 Offset,u16 *Value) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter);
@@ -519,11 +501,7 @@ u16 Offset, }/* EFUSE_ShadowRead2Byte */ /* Read Four Bytes */ -static void -efuse_ShadowRead4Byte ( -struct adapter *padapter, -u16 Offset, -u32 *Value) +static void efuse_ShadowRead4Byte (struct adapter *padapter,u16 Offset,u32 *Value) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter);
@@ -550,10 +528,7 @@ u16 Offset,* 11/13/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -void EFUSE_ShadowMapUpdate ( -struct adapter *padapter, -u8 efuseType, -bool bPseudoTest) +void EFUSE_ShadowMapUpdate (struct adapter *padapter,u8 efuseType,bool bPseudoTest) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter);u16 mapLen =0 ;
@@ -586,12 +561,7 @@ void EFUSE_ShadowMapUpdate(* 11/12/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -void -EFUSE_ShadowRead ( -struct adapter *padapter, -u8 Type, -u16 Offset, -u32 *Value) +void EFUSE_ShadowRead (struct adapter *padapter,u8 Type,u16 Offset,u32 *Value) {if (Type ==1 )efuse_ShadowRead1Byte (padapter, Offset, (u8 *)Value);
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +5 -8
@@ -119,14 +119,11 @@ u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *sourc }/* rtw_set_ie will update frame length */ -u8 *rtw_set_ie -( -u8 *pbuf, -sint index, -uint len, -u8 *source, -uint *frlen/* frame length */ -) +u8 *rtw_set_ie (u8 *pbuf, +sint index, +uint len, +u8 *source, +uint *frlen)/* frame length */ { *pbuf = (u8 )index;
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +4 -6
@@ -657,12 +657,10 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)if (IsSupportedHT (psta->wireless_mode)) {rtw_hal_get_hwreg (adapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); - max_rate =rtw_mcs_rate ( - rf_type, - ((psta->bw_mode ==CHANNEL_WIDTH_40 )?1 :0 ), - short_GI, - psta->htpriv.ht_cap.mcs.rx_mask - ); + max_rate =rtw_mcs_rate (rf_type, + ((psta->bw_mode ==CHANNEL_WIDTH_40 )?1 :0 ), + short_GI, + psta->htpriv.ht_cap.mcs.rx_mask); }else {while ((pcur_bss->SupportedRates[i] !=0 ) && (pcur_bss->SupportedRates[i] !=0xFF )) { rate = pcur_bss->SupportedRates[i]&0x7F ;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +6 -10
@@ -2487,11 +2487,9 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)int len_diff;memcpy (pframe, cur_network->IEs, cur_network->IELength); - len_diff =update_hidden_ssid ( - pframe+_BEACON_IE_OFFSET_ - , cur_network->IELength-_BEACON_IE_OFFSET_ - , pmlmeinfo->hidden_ssid_mode - ); + len_diff =update_hidden_ssid (pframe+_BEACON_IE_OFFSET_, + cur_network->IELength-_BEACON_IE_OFFSET_, + pmlmeinfo->hidden_ssid_mode); pframe += (cur_network->IELength+len_diff); pattrib->pktlen += (cur_network->IELength+len_diff); }
@@ -6584,11 +6582,9 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)memcpy (&(ptxBeacon_parm->network), &(pmlmeinfo->network),sizeof (struct wlan_bssid_ex )); - len_diff =update_hidden_ssid ( - ptxBeacon_parm->network.IEs+_BEACON_IE_OFFSET_ - , ptxBeacon_parm->network.IELength-_BEACON_IE_OFFSET_ - , pmlmeinfo->hidden_ssid_mode - ); + len_diff =update_hidden_ssid (ptxBeacon_parm->network.IEs+_BEACON_IE_OFFSET_, + ptxBeacon_parm->network.IELength-_BEACON_IE_OFFSET_, + pmlmeinfo->hidden_ssid_mode); ptxBeacon_parm->network.IELength += len_diff;init_h2fwcmd_w_parm_no_rsp (ph2c, ptxBeacon_parm,GEN_CMD_CODE (_TX_Beacon));
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +2 -5
@@ -672,8 +672,7 @@ void LeaveAllPowerSaveMode(struct adapter *Adapter) } } -void LPS_Leave_check ( -struct adapter *padapter) +void LPS_Leave_check (struct adapter *padapter) {struct pwrctrl_priv *pwrpriv;unsigned long start_time;
@@ -714,9 +713,7 @@ void LPS_Leave_check(* * using to update cpwn of drv; and drv willl make a decision to up or down pwr level */ -void cpwm_int_hdl ( -struct adapter *padapter, -struct reportpwrstate_parm *preportpwrstate) +void cpwm_int_hdl (struct adapter *padapter,struct reportpwrstate_parm *preportpwrstate) {struct pwrctrl_priv *pwrpriv;
drivers/staging/rtl8723bs/core/rtw_recv.c +12 -26
@@ -765,16 +765,10 @@ void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, structtraffic_check_for_leave_lps (padapter, false,0 ); } -sint sta2sta_data_frame ( -struct adapter *adapter, -union recv_frame *precv_frame, -struct sta_info **psta -); -sint sta2sta_data_frame ( -struct adapter *adapter, -union recv_frame *precv_frame, -struct sta_info **psta -) +sint sta2sta_data_frame (struct adapter *adapter,union recv_frame *precv_frame, +struct sta_info **psta); +sint sta2sta_data_frame (struct adapter *adapter,union recv_frame *precv_frame, +struct sta_info **psta) {u8 *ptr = precv_frame->u.hdr.rx_data;sint ret = _SUCCESS;
@@ -866,14 +860,10 @@ sint sta2sta_data_frame(return ret; } -sint ap2sta_data_frame ( -struct adapter *adapter, -union recv_frame *precv_frame, -struct sta_info **psta); -sint ap2sta_data_frame ( -struct adapter *adapter, -union recv_frame *precv_frame, -struct sta_info **psta) +sint ap2sta_data_frame (struct adapter *adapter,union recv_frame *precv_frame, +struct sta_info **psta); +sint ap2sta_data_frame (struct adapter *adapter,union recv_frame *precv_frame, +struct sta_info **psta) {u8 *ptr = precv_frame->u.hdr.rx_data;struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@@ -1015,14 +1005,10 @@ sint ap2sta_data_frame(return ret; } -sint sta2ap_data_frame ( -struct adapter *adapter, -union recv_frame *precv_frame, -struct sta_info **psta); -sint sta2ap_data_frame ( -struct adapter *adapter, -union recv_frame *precv_frame, -struct sta_info **psta) +sint sta2ap_data_frame (struct adapter *adapter,union recv_frame *precv_frame, +struct sta_info **psta); +sint sta2ap_data_frame (struct adapter *adapter,union recv_frame *precv_frame, +struct sta_info **psta) {u8 *ptr = precv_frame->u.hdr.rx_data;struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
drivers/staging/rtl8723bs/core/rtw_security.c +88 -173
351 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +18 -24
54 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_xmit.c +5 -12
@@ -2586,9 +2586,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pstspin_unlock_bh (&pxmitpriv->lock); } -void enqueue_pending_xmitbuf ( -struct xmit_priv *pxmitpriv, -struct xmit_buf *pxmitbuf) +void enqueue_pending_xmitbuf (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf) {struct __queue *pqueue;struct adapter *pri_adapter = pxmitpriv->adapter;
@@ -2603,9 +2601,7 @@ void enqueue_pending_xmitbuf(complete (&pri_adapter->xmitpriv.xmit_comp); } -void enqueue_pending_xmitbuf_to_head ( -struct xmit_priv *pxmitpriv, -struct xmit_buf *pxmitbuf) +void enqueue_pending_xmitbuf_to_head (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf) {struct __queue *pqueue;
@@ -2617,8 +2613,7 @@ void enqueue_pending_xmitbuf_to_head(spin_unlock_bh (&pqueue->lock); } -struct xmit_buf *dequeue_pending_xmitbuf ( -struct xmit_priv *pxmitpriv) +struct xmit_buf *dequeue_pending_xmitbuf (struct xmit_priv *pxmitpriv) {struct xmit_buf *pxmitbuf;struct __queue *pqueue;
@@ -2642,8 +2637,7 @@ struct xmit_buf *dequeue_pending_xmitbuf(return pxmitbuf; } -struct xmit_buf *dequeue_pending_xmitbuf_under_survey ( -struct xmit_priv *pxmitpriv) +struct xmit_buf *dequeue_pending_xmitbuf_under_survey (struct xmit_priv *pxmitpriv) {struct xmit_buf *pxmitbuf;struct __queue *pqueue;
@@ -2683,8 +2677,7 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey(return pxmitbuf; } -sint check_pending_xmitbuf ( -struct xmit_priv *pxmitpriv) +sint check_pending_xmitbuf (struct xmit_priv *pxmitpriv) {struct __queue *pqueue;sint ret = false;
Signature · 1 line
2.25.1
PATCH 5/10 staging: rtl8723bs: clean up open braces
In reply to Ross SchmidtMove braces to fix coding style issues and clear checkpatch errors. Some braces are removed for single statements.
ERROR: open brace '{' following function definitions go on the next line
ERROR: that open brace { should be on the previous line
--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 167 ++++++------------ 1 file changed, 54 insertions(+), 113 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +54 -113
@@ -1746,8 +1746,7 @@ static int rtw_cfg80211_set_cipher(struct security_priv *psecuritypriv, u32 ciphreturn -ENOTSUPP ; } -if (ucast) - { +if (ucast) { psecuritypriv->ndisencryptstatus = ndisencryptstatus;/* if (psecuritypriv->dot11PrivacyAlgrthm >= _AES_) */
@@ -1819,10 +1818,8 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel } pwpa =rtw_get_wpa_ie (buf, &wpa_ielen, ielen); -if (pwpa && wpa_ielen >0 ) - { -if (rtw_parse_wpa_ie (pwpa, wpa_ielen+2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) - { +if (pwpa && wpa_ielen >0 ) { +if (rtw_parse_wpa_ie (pwpa, wpa_ielen+2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa[0 ], wpa_ielen+2 );
@@ -1832,10 +1829,8 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel } pwpa2 =rtw_get_wpa2_ie (buf, &wpa2_ielen, ielen); -if (pwpa2 && wpa2_ielen >0 ) - { -if (rtw_parse_wpa2_ie (pwpa2, wpa2_ielen+2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) - { +if (pwpa2 && wpa2_ielen >0 ) { +if (rtw_parse_wpa2_ie (pwpa2, wpa2_ielen+2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa2[0 ], wpa2_ielen+2 );
@@ -1845,13 +1840,10 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel }if (group_cipher ==0 ) - { group_cipher =WPA_CIPHER_NONE ; - } +if (pairwise_cipher ==0 ) - { pairwise_cipher =WPA_CIPHER_NONE ; - }switch (group_cipher) {
@@ -1954,8 +1946,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, goto exit; } -if (!params->ssid || !params->ssid_len) - { +if (!params->ssid || !params->ssid_len) { ret = -EINVAL ; goto exit; }
@@ -1981,8 +1972,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, ret =rtw_cfg80211_set_auth_type (psecuritypriv,NL80211_AUTHTYPE_OPEN_SYSTEM );rtw_set_802_11_authentication_mode (padapter, psecuritypriv->ndisauthtype); -if (rtw_set_802_11_ssid (padapter, &ndis_ssid) == false) - { +if (rtw_set_802_11_ssid (padapter, &ndis_ssid) == false) { ret =-1 ; goto exit; }
@@ -2004,8 +1994,7 @@ static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev)rtw_set_to_roam (padapter,0 ); -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED)) - { +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED)) {rtw_scan_abort (padapter);LeaveAllPowerSaveMode (padapter);
@@ -2041,8 +2030,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, sme->privacy, sme->key, sme->key_len, sme->key_idx); -if (adapter_wdev_data (padapter)->block == true) - { +if (adapter_wdev_data (padapter)->block == true) { ret = -EBUSY ;DBG_871X ("%s wdev_priv.block is set\n" , __func__); goto exit;
@@ -2059,8 +2047,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, goto exit; } -if (!sme->ssid || !sme->ssid_len) - { +if (!sme->ssid || !sme->ssid_len) { ret = -EINVAL ; goto exit; }
@@ -2119,10 +2106,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, }/* For WEP Shared auth */ -if ((psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Shared - || psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Auto) && sme->key - ) - { +if ((psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Shared || + psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;DBG_871X ("%s(): Shared/Auto WEP\n" , __func__);
@@ -2135,8 +2120,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, goto exit; } -if (wep_key_len >0 ) - { +if (wep_key_len >0 ) { wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); pwep =rtw_malloc (wep_total_len);
@@ -2151,13 +2135,11 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, pwep->KeyLength = wep_key_len; pwep->Length = wep_total_len; -if (wep_key_len ==13 ) - { +if (wep_key_len ==13 ) { padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_; padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_; } - } -else { + }else { ret = -EINVAL ; goto exit; }
@@ -2168,9 +2150,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,memcpy (pwep->KeyMaterial, (void *)sme->key, pwep->KeyLength);if (rtw_set_802_11_add_wep (padapter, pwep) == (u8 )_FAIL) - { ret = -EOPNOTSUPP ; - }kfree (pwep);
@@ -2290,17 +2270,14 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,DBG_871X (FUNC_NDEV_FMT "\n" ,FUNC_NDEV_ARG (ndev));if (!memcmp ((u8 *)pmksa->bssid, strZeroMacAddress,ETH_ALEN )) - {return -EINVAL ; - } blInserted = false;/* overwrite PMKID */ -for (index =0 ; index <NUM_PMKID_CACHE ; index++) - { -if (!memcmp (psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid,ETH_ALEN )) - {/* BSSID is matched, the same AP => rewrite with new PMKID. */ +for (index =0 ; index <NUM_PMKID_CACHE ; index++) { +if (!memcmp (psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid,ETH_ALEN )) { +/* BSSID is matched, the same AP => rewrite with new PMKID. */ DBG_871X (FUNC_NDEV_FMT " BSSID exists in the PMKList.\n" ,FUNC_NDEV_ARG (ndev));memcpy (psecuritypriv->PMKIDList[index].PMKID, (u8 *)pmksa->pmkid,WLAN_PMKID_LEN );
@@ -2311,8 +2288,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, } } -if (!blInserted) - { +if (!blInserted) {/* Find a new entry */ DBG_871X (FUNC_NDEV_FMT " Use the new entry index = %d for this PMKID.\n" ,FUNC_NDEV_ARG (ndev), psecuritypriv->PMKIDIndex);
@@ -2323,9 +2299,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bUsed = true; psecuritypriv->PMKIDIndex++;if (psecuritypriv->PMKIDIndex ==16 ) - { psecuritypriv->PMKIDIndex =0 ; - } }return 0 ;
@@ -2341,10 +2315,12 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,DBG_871X (FUNC_NDEV_FMT "\n" ,FUNC_NDEV_ARG (ndev)); -for (index =0 ; index <NUM_PMKID_CACHE ; index++) - { -if (!memcmp (psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid,ETH_ALEN )) - {/* BSSID is matched, the same AP => Remove this PMKID information and reset it. */ +for (index =0 ; index <NUM_PMKID_CACHE ; index++) { +if (!memcmp (psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid,ETH_ALEN )) { +/* +* BSSID is matched, the same AP => Remove this PMKID information +* and reset it. +*/ eth_zero_addr (psecuritypriv->PMKIDList[index].Bssid);memset (psecuritypriv->PMKIDList[index].PMKID,0x00 ,WLAN_PMKID_LEN ); psecuritypriv->PMKIDList[index].bUsed = false;
@@ -2353,8 +2329,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, } } -if (false == bMatched) - { +if (false == bMatched) {DBG_871X (FUNC_NDEV_FMT " do not have matched BSSID\n" ,FUNC_NDEV_ARG (ndev));return -EINVAL ;
@@ -2441,8 +2416,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, strucif (unlikely (skb->len < rtap_len)) goto fail; -if (rtap_len !=14 ) - { +if (rtap_len !=14 ) {DBG_8192C ("radiotap len (should be 14): %d\n" , rtap_len); goto fail; }
@@ -2478,11 +2452,8 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc/* Use the real net device to transmit the packet */ return _rtw_xmit_entry (skb, padapter->pnetdev); - } -else if ((frame_control & (IEEE80211_FCTL_FTYPE |IEEE80211_FCTL_STYPE )) - == (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_ACTION ) - ) - { + }else if ((frame_control & (IEEE80211_FCTL_FTYPE |IEEE80211_FCTL_STYPE )) == + (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_ACTION )) {/* only for action frames */ struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;
@@ -2511,9 +2482,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc/* starting alloc mgmt frame to dump it */ if ((pmgntframe =alloc_mgtxmitframe (pxmitpriv)) ==NULL ) - { goto fail; - }/* update attribute */ pattrib = &pmgntframe->attrib;
@@ -2538,9 +2507,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, strucdump_mgntframe (padapter, pmgntframe); - } -else - { + }else {DBG_8192C ("frame_control = 0x%x\n" , frame_control & (IEEE80211_FCTL_FTYPE |IEEE80211_FCTL_STYPE )); }
@@ -2738,12 +2705,9 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_lrtw_ies_remove_ie (pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_,P2P_OUI ,4 );rtw_ies_remove_ie (pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_,WFD_OUI ,4 ); -if (rtw_check_beacon_data (adapter, pbuf, len) == _SUCCESS) - { +if (rtw_check_beacon_data (adapter, pbuf, len) == _SUCCESS) { ret =0 ; - } -else - { + }else { ret = -EINVAL ; }
@@ -2819,15 +2783,13 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndevDBG_871X ("+" FUNC_NDEV_FMT "\n" ,FUNC_NDEV_ARG (ndev)); -if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true) - { +if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true) {DBG_8192C ("%s, fw_state != FW_LINKED|WIFI_AP_STATE\n" , __func__);return -EINVAL ; } -if (!mac) - { +if (!mac) {DBG_8192C ("flush all sta, and cam_entry\n" );flush_all_cam_entry (padapter);/* clear CAM */
@@ -2842,8 +2804,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndevif (mac[0 ] ==0xff && mac[1 ] ==0xff && mac[2 ] ==0xff && mac[3 ] ==0xff && - mac[4 ] ==0xff && mac[5 ] ==0xff ) - { + mac[4 ] ==0xff && mac[5 ] ==0xff ) {return -EINVAL ; }
@@ -2854,20 +2815,15 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev plist =get_next (phead);/* check asoc_queue */ -while (phead != plist) - { +while (phead != plist) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); plist =get_next (plist); -if (!memcmp ((u8 *)mac, psta->hwaddr,ETH_ALEN )) - { -if (psta->dot8021xalg ==1 && psta->bpairwise_key_installed == false) - { +if (!memcmp ((u8 *)mac, psta->hwaddr,ETH_ALEN )) { +if (psta->dot8021xalg ==1 && psta->bpairwise_key_installed == false) {DBG_8192C ("%s, sta's dot8021xalg = 1 and key_installed = false\n" , __func__); - } -else - { + }else {DBG_8192C ("free psta =%p, aid =%d\n" , psta, psta->aid);list_del_init (&psta->asoc_list);
@@ -2913,8 +2869,7 @@ static struct sta_info *rtw_sta_info_get_by_idx(const int idx, struct sta_priv * plist =get_next (phead);/* check asoc_queue */ -while (phead != plist) - { +while (phead != plist) { if (idx == i) psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); plist =get_next (plist); i++;
@@ -2935,8 +2890,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *ndespin_lock_bh (&pstapriv->asoc_list_lock); psta =rtw_sta_info_get_by_idx (idx, pstapriv);spin_unlock_bh (&pstapriv->asoc_list_lock); -if (NULL == psta) - { +if (NULL == psta) {DBG_871X ("Station is not found\n" ); ret = -ENOENT ; goto exit;
@@ -2998,8 +2952,7 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b }/* starting alloc mgmt frame to dump it */ -if ((pmgntframe =alloc_mgtxmitframe (pxmitpriv)) ==NULL ) - { +if ((pmgntframe =alloc_mgtxmitframe (pxmitpriv)) ==NULL ) {/* ret = -ENOMEM; */ ret = _FAIL; goto exit;
@@ -3025,18 +2978,14 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b pattrib->last_txcmdsz = pattrib->pktlen; -if (dump_mgntframe_and_wait_ack (padapter, pmgntframe) != _SUCCESS) - { +if (dump_mgntframe_and_wait_ack (padapter, pmgntframe) != _SUCCESS) { ack = false; ret = _FAIL;#ifdef DEBUG_CFG80211 DBG_8192C ("%s, ack == _FAIL\n" , __func__);#endif - } -else - { - + }else {msleep (50 );#ifdef DEBUG_CFG80211
@@ -3129,9 +3078,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,rtw_clear_scan_deny (padapter);break ;case P2P_INVIT_RESP : -if (pwdev_priv->invit_info.flags &BIT (0 ) - && pwdev_priv->invit_info.status ==0 ) - { +if (pwdev_priv->invit_info.flags &BIT (0 ) && pwdev_priv->invit_info.status ==0 ) {DBG_871X (FUNC_ADPT_FMT " agree with invitation of persistent group\n" ,FUNC_ADPT_ARG (padapter));rtw_set_scan_deny (padapter,5000 );
@@ -3148,10 +3095,9 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, }#if defined(CONFIG_PNO_SUPPORT ) -static int cfg80211_rtw_sched_scan_start (struct wiphy *wiphy, -struct net_device *dev, -struct cfg80211_sched_scan_request *request) { - +static int cfg80211_rtw_sched_scan_start (struct wiphy *wiphy,struct net_device *dev, +struct cfg80211_sched_scan_request *request) +{struct adapter *padapter =rtw_netdev_priv (dev);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);int ret;
@@ -3190,8 +3136,8 @@ static int cfg80211_rtw_sched_scan_start(struct wiphy *wiphy, return ret; } -static int cfg80211_rtw_sched_scan_stop (struct wiphy *wiphy, -struct net_device *dev) { +static int cfg80211_rtw_sched_scan_stop (struct wiphy *wiphy,struct net_device *dev) +{return rtw_android_pno_enable (dev, false); }#endif /* CONFIG_PNO_SUPPORT */
@@ -3229,24 +3175,19 @@ static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum*if BW_40 rx_mask[4]= 0x01; *highest supported RX rate */ -if (rf_type ==RF_1T1R ) - { +if (rf_type ==RF_1T1R ) { ht_cap->mcs.rx_mask[0 ] =0xFF ; ht_cap->mcs.rx_mask[1 ] =0x00 ; ht_cap->mcs.rx_mask[4 ] =0x01 ; ht_cap->mcs.rx_highest =cpu_to_le16 (MAX_BIT_RATE_40MHZ_MCS7 ); - } -else if ((rf_type ==RF_1T2R ) || (rf_type ==RF_2T2R )) - { + }else if ((rf_type ==RF_1T2R ) || (rf_type ==RF_2T2R )) { ht_cap->mcs.rx_mask[0 ] =0xFF ; ht_cap->mcs.rx_mask[1 ] =0xFF ; ht_cap->mcs.rx_mask[4 ] =0x01 ; ht_cap->mcs.rx_highest =cpu_to_le16 (MAX_BIT_RATE_40MHZ_MCS15 ); - } -else - { + }else {DBG_8192C ("%s, error rf_type =%d\n" , __func__, rf_type); }
Signature · 1 line
2.25.1
PATCH 6/10 staging: rtl8723bs: clean up switch case indentation
In reply to Ross SchmidtMove cases to align with switch indentation to fix coding style issues and clear checkpatch errors.
ERROR: switch and case should be at the same indent
--- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 219 +++++++++--------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 14 +- 2 files changed, 116 insertions(+), 117 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +109 -110
@@ -664,49 +664,49 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie pairwise_cipher =WPA_CIPHER_NONE ;switch (group_cipher) { -case WPA_CIPHER_NONE : - padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; -break ; -case WPA_CIPHER_WEP40 : - padapter->securitypriv.dot118021XGrpPrivacy = _WEP40_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -break ; -case WPA_CIPHER_TKIP : - padapter->securitypriv.dot118021XGrpPrivacy = _TKIP_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; -break ; -case WPA_CIPHER_CCMP : - padapter->securitypriv.dot118021XGrpPrivacy = _AES_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; -break ; -case WPA_CIPHER_WEP104 : - padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -break ; +case WPA_CIPHER_NONE : + padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; +break ; +case WPA_CIPHER_WEP40 : + padapter->securitypriv.dot118021XGrpPrivacy = _WEP40_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; +break ; +case WPA_CIPHER_TKIP : + padapter->securitypriv.dot118021XGrpPrivacy = _TKIP_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; +break ; +case WPA_CIPHER_CCMP : + padapter->securitypriv.dot118021XGrpPrivacy = _AES_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; +break ; +case WPA_CIPHER_WEP104 : + padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; +break ; }switch (pairwise_cipher) { -case WPA_CIPHER_NONE : - padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; -break ; -case WPA_CIPHER_WEP40 : - padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -break ; -case WPA_CIPHER_TKIP : - padapter->securitypriv.dot11PrivacyAlgrthm = _TKIP_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; -break ; -case WPA_CIPHER_CCMP : - padapter->securitypriv.dot11PrivacyAlgrthm = _AES_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; -break ; -case WPA_CIPHER_WEP104 : - padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_; - padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -break ; +case WPA_CIPHER_NONE : + padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; +break ; +case WPA_CIPHER_WEP40 : + padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; +break ; +case WPA_CIPHER_TKIP : + padapter->securitypriv.dot11PrivacyAlgrthm = _TKIP_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; +break ; +case WPA_CIPHER_CCMP : + padapter->securitypriv.dot11PrivacyAlgrthm = _AES_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; +break ; +case WPA_CIPHER_WEP104 : + padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_; + padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; +break ; }_clr_fwstate_ (&padapter->mlmepriv,WIFI_UNDER_WPS );
@@ -860,28 +860,27 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, }switch (wrqu->mode) { -case IW_MODE_AUTO : - networkType = Ndis802_11AutoUnknown; -DBG_871X ("set_mode = IW_MODE_AUTO\n" ); -break ; -case IW_MODE_ADHOC : - networkType = Ndis802_11IBSS; -DBG_871X ("set_mode = IW_MODE_ADHOC\n" ); -break ; -case IW_MODE_MASTER : - networkType = Ndis802_11APMode; -DBG_871X ("set_mode = IW_MODE_MASTER\n" ); -/* rtw_setopmode_cmd(padapter, networkType, true); */ -break ; -case IW_MODE_INFRA : - networkType = Ndis802_11Infrastructure; -DBG_871X ("set_mode = IW_MODE_INFRA\n" ); -break ; - -default : - ret = -EINVAL ; -RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_err_, ("\n Mode: %s is not supported \n" , iw_operation_mode[wrqu->mode])); - goto exit; +case IW_MODE_AUTO : + networkType = Ndis802_11AutoUnknown; +DBG_871X ("set_mode = IW_MODE_AUTO\n" ); +break ; +case IW_MODE_ADHOC : + networkType = Ndis802_11IBSS; +DBG_871X ("set_mode = IW_MODE_ADHOC\n" ); +break ; +case IW_MODE_MASTER : + networkType = Ndis802_11APMode; +DBG_871X ("set_mode = IW_MODE_MASTER\n" ); +/* rtw_setopmode_cmd(padapter, networkType, true); */ +break ; +case IW_MODE_INFRA : + networkType = Ndis802_11Infrastructure; +DBG_871X ("set_mode = IW_MODE_INFRA\n" ); +break ; +default : + ret = -EINVAL ; +RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_err_, ("\n Mode: %s is not supported \n" , iw_operation_mode[wrqu->mode])); + goto exit; }/*
@@ -1342,50 +1341,50 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, section = *(pos++); len -=1 ;switch (section) { -case WEXT_CSCAN_SSID_SECTION : -/* DBG_871X("WEXT_CSCAN_SSID_SECTION\n"); */ -if (len <1 ) { - len =0 ; -break ; - } +case WEXT_CSCAN_SSID_SECTION : +/* DBG_871X("WEXT_CSCAN_SSID_SECTION\n"); */ +if (len <1 ) { + len =0 ; +break ; + } - sec_len = *(pos++); len -=1 ; + sec_len = *(pos++); len -=1 ; -if (sec_len >0 && sec_len <= len) { - ssid[ssid_index].SsidLength = sec_len; -memcpy (ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength); -/* DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__ */ -/* , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); */ - ssid_index++; - } +if (sec_len >0 && sec_len <= len) { + ssid[ssid_index].SsidLength = sec_len; +memcpy (ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength); +/* DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__ */ +/* , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); */ + ssid_index++; + } - pos += sec_len; len -= sec_len; -break ; + pos += sec_len; len -= sec_len; +break ; -case WEXT_CSCAN_CHANNEL_SECTION : -/* DBG_871X("WEXT_CSCAN_CHANNEL_SECTION\n"); */ - pos +=1 ; len -=1 ; -break ; -case WEXT_CSCAN_ACTV_DWELL_SECTION : -/* DBG_871X("WEXT_CSCAN_ACTV_DWELL_SECTION\n"); */ - pos +=2 ; len -=2 ; -break ; -case WEXT_CSCAN_PASV_DWELL_SECTION : -/* DBG_871X("WEXT_CSCAN_PASV_DWELL_SECTION\n"); */ - pos +=2 ; len -=2 ; -break ; -case WEXT_CSCAN_HOME_DWELL_SECTION : -/* DBG_871X("WEXT_CSCAN_HOME_DWELL_SECTION\n"); */ - pos +=2 ; len -=2 ; -break ; -case WEXT_CSCAN_TYPE_SECTION : -/* DBG_871X("WEXT_CSCAN_TYPE_SECTION\n"); */ - pos +=1 ; len -=1 ; -break ; -default : -/* DBG_871X("Unknown CSCAN section %c\n", section); */ - len =0 ;/* stop parsing */ +case WEXT_CSCAN_CHANNEL_SECTION : +/* DBG_871X("WEXT_CSCAN_CHANNEL_SECTION\n"); */ + pos +=1 ; len -=1 ; +break ; +case WEXT_CSCAN_ACTV_DWELL_SECTION : +/* DBG_871X("WEXT_CSCAN_ACTV_DWELL_SECTION\n"); */ + pos +=2 ; len -=2 ; +break ; +case WEXT_CSCAN_PASV_DWELL_SECTION : +/* DBG_871X("WEXT_CSCAN_PASV_DWELL_SECTION\n"); */ + pos +=2 ; len -=2 ; +break ; +case WEXT_CSCAN_HOME_DWELL_SECTION : +/* DBG_871X("WEXT_CSCAN_HOME_DWELL_SECTION\n"); */ + pos +=2 ; len -=2 ; +break ; +case WEXT_CSCAN_TYPE_SECTION : +/* DBG_871X("WEXT_CSCAN_TYPE_SECTION\n"); */ + pos +=1 ; len -=1 ; +break ; +default : +/* DBG_871X("Unknown CSCAN section %c\n", section); */ + len =0 ;/* stop parsing */ }/* DBG_871X("len:%d\n", len); */
@@ -1917,15 +1916,15 @@ static int rtw_wx_set_enc(struct net_device *dev,DBG_871X ("(keyindex_provided == 1), keyid =%d, key_len =%d\n" , key, padapter->securitypriv.dot11DefKeylen[key]);switch (padapter->securitypriv.dot11DefKeylen[key]) { -case 5 : - padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_; -break ; -case 13 : - padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_; -break ; -default : - padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_; -break ; +case 5 : + padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_; +break ; +case 13 : + padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_; +break ; +default : + padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_; +break ; } goto exit;
drivers/staging/rtl8723bs/os_dep/os_intfs.c +7 -7
@@ -400,17 +400,17 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)memcpy (ð_type, pdata + (ETH_ALEN <<1 ),2 );switch (be16_to_cpu (eth_type)) { -case ETH_P_IP : +case ETH_P_IP : - piphdr = (struct iphdr *)(pdata +ETH_HLEN ); + piphdr = (struct iphdr *)(pdata +ETH_HLEN ); - dscp = piphdr->tos &0xfc ; + dscp = piphdr->tos &0xfc ; - priority = dscp >>5 ; + priority = dscp >>5 ; -break ; -default : - priority =0 ; +break ; +default : + priority =0 ; }return rtw_1d_to_queue[priority];
Signature · 1 line
2.25.1
PATCH 7/10 staging: rtl8723bs: clean up trailing statements
In reply to Ross SchmidtMove trailing statements to the next line to fix coding style issues and clear checkpatch errors.
ERROR: trailing statements should be on next line
--- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 ++- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -1
@@ -2870,7 +2870,8 @@ static struct sta_info *rtw_sta_info_get_by_idx(const int idx, struct sta_priv */* check asoc_queue */ while (phead != plist) { - if (idx == i) psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); +if (idx == i) + psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); plist =get_next (plist); i++; }
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +6 -3
@@ -3151,7 +3151,8 @@ static int rtw_dbg_port(struct net_device *dev,#endif case 0xaa : { -if ((extra_arg &0x7F ) >0x3F ) extra_arg =0xFF ; +if ((extra_arg &0x7F ) >0x3F ) + extra_arg =0xFF ;DBG_871X ("chang data rate to :0x%02x\n" , extra_arg); padapter->fix_rate = extra_arg; }
@@ -4934,7 +4935,8 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ count =0 ;do { str =strsep (&ptr, delim); -if (NULL == str)break ; +if (NULL == str) +break ;sscanf (str,"%i" , &temp); buffer[count++] = (u8 )temp; }while (1 );
@@ -4952,7 +4954,8 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ count =0 ;do { str =strsep (&ptr, delim); -if (NULL == str)break ; +if (NULL == str) +break ;sscanf (str,"%i" , &temp); ((s32 *)buffer)[count++] = (s32 )temp; }while (1 );
Signature · 1 line
2.25.1
PATCH 8/10 staging: rtl8723bs: clean up logical continuations
In reply to Ross SchmidtMove operators to fix coding style issues and clear checkpatch checks.
CHECK: Logical continuations should be on the previous line
--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 41 +++++++------------ drivers/staging/rtl8723bs/core/rtw_recv.c | 27 ++++++------ .../staging/rtl8723bs/core/rtw_wlan_util.c | 6 +-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 6 +-- 4 files changed, 34 insertions(+), 46 deletions(-)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +15 -26
@@ -451,9 +451,8 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ahal_btcoex_LpsNotify (padapter, ps_mode); } }else { -if ((PS_RDY_CHECK (padapter) &&check_fwstate (&padapter->mlmepriv,WIFI_ASOC_STATE )) - || ((hal_btcoex_IsBtControlLps (padapter)) - && (hal_btcoex_IsLpsOn (padapter))) +if ((PS_RDY_CHECK (padapter) &&check_fwstate (&padapter->mlmepriv,WIFI_ASOC_STATE )) || + ((hal_btcoex_IsBtControlLps (padapter)) && (hal_btcoex_IsLpsOn (padapter))) ) {u8 pslv;
@@ -472,8 +471,8 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_aif (pwrpriv->alives ==0 ) pslv =PS_STATE_S0 ; -if (!(hal_btcoex_IsBtDisabled (padapter)) - && (hal_btcoex_IsBtControlLps (padapter))) { +if (!(hal_btcoex_IsBtDisabled (padapter)) && + (hal_btcoex_IsBtControlLps (padapter))) {u8 val8; val8 =hal_btcoex_LpsVal (padapter);
@@ -688,9 +687,9 @@ void LPS_Leave_check(struct adapter *padapter)while (1 ) {mutex_lock (&pwrpriv->lock); -if (padapter->bSurpriseRemoved - || !(padapter->hw_init_completed) - || (pwrpriv->pwr_mode ==PS_MODE_ACTIVE )) +if (padapter->bSurpriseRemoved || + !(padapter->hw_init_completed) || + (pwrpriv->pwr_mode ==PS_MODE_ACTIVE )) bReady = true;mutex_unlock (&pwrpriv->lock);
@@ -897,8 +896,7 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task) pwrctrl =adapter_to_pwrctl (padapter); pslv =PS_STATE_S0 ; -if (!(hal_btcoex_IsBtDisabled (padapter)) - &&hal_btcoex_IsBtControlLps (padapter)) { +if (!(hal_btcoex_IsBtDisabled (padapter)) &&hal_btcoex_IsBtControlLps (padapter)) {u8 val8; val8 =hal_btcoex_LpsVal (padapter);
@@ -910,8 +908,7 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task)unregister_task_alive (pwrctrl, task); -if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) - && pwrctrl->bFwCurrentInPSMode) { +if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) {RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, ("%s: cpwm = 0x%02x alives = 0x%08x\n" , __func__, pwrctrl->cpwm, pwrctrl->alives));
@@ -1038,8 +1035,7 @@ void rtw_unregister_tx_alive(struct adapter *padapter) pwrctrl =adapter_to_pwrctl (padapter); pslv =PS_STATE_S0 ; -if (!(hal_btcoex_IsBtDisabled (padapter)) - &&hal_btcoex_IsBtControlLps (padapter)) { +if (!(hal_btcoex_IsBtDisabled (padapter)) &&hal_btcoex_IsBtControlLps (padapter)) {u8 val8; val8 =hal_btcoex_LpsVal (padapter);
@@ -1051,8 +1047,7 @@ void rtw_unregister_tx_alive(struct adapter *padapter)unregister_task_alive (pwrctrl,XMIT_ALIVE ); -if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) - && pwrctrl->bFwCurrentInPSMode) { +if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) {RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, ("%s: cpwm = 0x%02x alives = 0x%08x\n" , __func__, pwrctrl->cpwm, pwrctrl->alives));
@@ -1080,8 +1075,7 @@ void rtw_unregister_cmd_alive(struct adapter *padapter) pwrctrl =adapter_to_pwrctl (padapter); pslv =PS_STATE_S0 ; -if (!(hal_btcoex_IsBtDisabled (padapter)) - &&hal_btcoex_IsBtControlLps (padapter)) { +if (!(hal_btcoex_IsBtDisabled (padapter)) &&hal_btcoex_IsBtControlLps (padapter)) {u8 val8; val8 =hal_btcoex_LpsVal (padapter);
@@ -1093,8 +1087,7 @@ void rtw_unregister_cmd_alive(struct adapter *padapter)unregister_task_alive (pwrctrl,CMD_ALIVE ); -if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) - && pwrctrl->bFwCurrentInPSMode) { +if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) {RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_info_, ("%s: cpwm = 0x%02x alives = 0x%08x\n" , __func__, pwrctrl->cpwm, pwrctrl->alives));
@@ -1226,8 +1219,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *calif (!(pwrpriv->bInternalAutoSuspend) && pwrpriv->bInSuspend) {DBG_871X ("%s wait bInSuspend...\n" , __func__); -while (pwrpriv->bInSuspend - &&jiffies_to_msecs (jiffies - start) <=3000 +while (pwrpriv->bInSuspend &&jiffies_to_msecs (jiffies - start) <=3000 ) {mdelay (10 ); }
@@ -1267,10 +1259,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal }/* TODO: the following checking need to be merged... */ -if (padapter->bDriverStopped - || !padapter->bup - || !padapter->hw_init_completed - ) { +if (padapter->bDriverStopped || !padapter->bup || !padapter->hw_init_completed) {DBG_8192C ("%s: bDriverStopped =%d, bup =%d, hw_init_completed =%u\n" , caller , padapter->bDriverStopped
drivers/staging/rtl8723bs/core/rtw_recv.c +13 -14
@@ -499,9 +499,8 @@ union recv_frame *decryptor(struct adapter *padapter, union recv_frame *precv_frdefault :break ; } - }else if (prxattrib->bdecrypted ==1 - && prxattrib->encrypt >0 - && (psecuritypriv->busetkipkey ==1 || prxattrib->encrypt != _TKIP_) + }else if (prxattrib->bdecrypted ==1 && prxattrib->encrypt >0 && + (psecuritypriv->busetkipkey ==1 || prxattrib->encrypt != _TKIP_) ) {DBG_COUNTER (padapter->rx_logs.core_rx_post_decrypt_hw);
@@ -874,9 +873,9 @@ sint ap2sta_data_frame(struct adapter *adapter, union recv_frame *precv_frame,u8 *myhwaddr =myid (&adapter->eeprompriv);sint bmcast =IS_MCAST (pattrib->dst); -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) - && (check_fwstate (pmlmepriv, _FW_LINKED) == true - ||check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true) +if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) && + (check_fwstate (pmlmepriv, _FW_LINKED) == true || +check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true) ) {/* filter packets that SA is myself or multicast or broadcast */
@@ -1226,8 +1225,8 @@ sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBERSP ) {if (!memcmp (padapter->eeprompriv.mac_addr,GetAddr1Ptr (precv_frame->u.hdr.rx_data),ETH_ALEN )) psta->sta_stats.rx_probersp_pkts++; -else if (is_broadcast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data)) - ||is_multicast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data))) +else if (is_broadcast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data)) || +is_multicast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data))) psta->sta_stats.rx_probersp_bm_pkts++;else psta->sta_stats.rx_probersp_uo_pkts++;
@@ -1388,8 +1387,8 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec subtype =GetFrameSubType (ptr);/* bit(7)~bit(2) */ /* only support station mode */ -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) &&check_fwstate (pmlmepriv, _FW_LINKED) - && adapter->securitypriv.binstallBIPkey == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) &&check_fwstate (pmlmepriv, _FW_LINKED) && + adapter->securitypriv.binstallBIPkey == true) {/* unicast management frame decrypt */ if (pattrib->privacy && !(IS_MCAST (GetAddr1Ptr (ptr))) && (subtype ==WIFI_DEAUTH || subtype ==WIFI_DISASSOC || subtype ==WIFI_ACTION )) {
@@ -2601,15 +2600,15 @@ static void rtw_signal_stat_timer_hdl(struct timer_list *t) }if (num_signal_strength ==0 ) { -if (rtw_get_on_cur_ch_time (adapter) ==0 - ||jiffies_to_msecs (jiffies -rtw_get_on_cur_ch_time (adapter)) <2 * adapter->mlmeextpriv.mlmext_info.bcn_interval +if (rtw_get_on_cur_ch_time (adapter) ==0 || +jiffies_to_msecs (jiffies -rtw_get_on_cur_ch_time (adapter)) <2 * adapter->mlmeextpriv.mlmext_info.bcn_interval ) { goto set_timer; } } -if (check_fwstate (&adapter->mlmepriv, _FW_UNDER_SURVEY) == true - ||check_fwstate (&adapter->mlmepriv, _FW_LINKED) == false +if (check_fwstate (&adapter->mlmepriv, _FW_UNDER_SURVEY) == true || +check_fwstate (&adapter->mlmepriv, _FW_LINKED) == false ) { goto set_timer; }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -3
@@ -1584,9 +1584,9 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)if ((!memcmp (pIE->data,ARTHEROS_OUI1 ,3 )) || (!memcmp (pIE->data,ARTHEROS_OUI2 ,3 ))) {DBG_871X ("link to Artheros AP\n" );return HT_IOT_PEER_ATHEROS ; - }else if ((!memcmp (pIE->data,BROADCOM_OUI1 ,3 )) - || (!memcmp (pIE->data,BROADCOM_OUI2 ,3 )) - || (!memcmp (pIE->data,BROADCOM_OUI3 ,3 ))) { + }else if ((!memcmp (pIE->data,BROADCOM_OUI1 ,3 )) || + (!memcmp (pIE->data,BROADCOM_OUI2 ,3 )) || + (!memcmp (pIE->data,BROADCOM_OUI3 ,3 ))) {DBG_871X ("link to Broadcom AP\n" );return HT_IOT_PEER_BROADCOM ; }else if (!memcmp (pIE->data,MARVELL_OUI ,3 )) {
drivers/staging/rtl8723bs/core/rtw_xmit.c +3 -3
@@ -2173,9 +2173,9 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe)if (registry->hiq_filter ==RTW_HIQ_FILTER_ALLOW_SPECIAL ) {struct pkt_attrib *attrib = &xmitframe->attrib; -if (attrib->ether_type ==0x0806 - || attrib->ether_type ==0x888e - || attrib->dhcp_pkt +if (attrib->ether_type ==0x0806 || + attrib->ether_type ==0x888e || + attrib->dhcp_pkt ) {DBG_871X (FUNC_ADPT_FMT " ether_type:0x%04x%s\n" ,FUNC_ADPT_ARG (xmitframe->padapter) , attrib->ether_type, attrib->dhcp_pkt?" DHCP" :"" );
Signature · 1 line
2.25.1
PATCH 9/10 staging: rtl8723bs: clean up pointer locations
In reply to Ross SchmidtMove pointer locations to fix coding style issues and clear checkpatch errors.
ERROR: "foo * bar" should be "foo *bar"
--- drivers/staging/rtl8723bs/include/rtw_io.h | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_mp.h | 10 +++++----- drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 6 +++--- drivers/staging/rtl8723bs/include/rtw_recv.h | 4 ++-- drivers/staging/rtl8723bs/include/rtw_security.h | 12 ++++++------ drivers/staging/rtl8723bs/include/rtw_xmit.h | 8 ++++---- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 10 +++++----- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 +++++++------- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 8 ++++---- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 10 +++++----- 12 files changed, 50 insertions(+), 50 deletions(-)
drivers/staging/rtl8723bs/include/rtw_io.h +1 -1
@@ -345,7 +345,7 @@ extern void free_io_queue(struct adapter *adapter);extern void async_bus_io (struct io_queue *pio_q);extern void bus_sync_io (struct io_queue *pio_q);extern u32 _ioreq2rwmem (struct io_queue *pio_q); -extern void dev_power_down (struct adapter * Adapter,u8 bpwrup); +extern void dev_power_down (struct adapter *Adapter,u8 bpwrup);#define PlatformEFIOWrite1Byte (_a, _b, _c) \ rtw_write8(_a, _b, _c)
drivers/staging/rtl8723bs/include/rtw_mlme.h +7 -7
@@ -559,15 +559,15 @@ static inline void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint valextern u16 rtw_get_capability (struct wlan_bssid_ex *bss);extern void rtw_update_scanned_network (struct adapter *adapter,struct wlan_bssid_ex *target); -extern void rtw_disconnect_hdl_under_linked (struct adapter * adapter,struct sta_info *psta,u8 free_assoc); +extern void rtw_disconnect_hdl_under_linked (struct adapter *adapter,struct sta_info *psta,u8 free_assoc);extern void rtw_generate_random_ibss (u8 *pibss); -extern struct wlan_network *rtw_find_network (struct __queue *scanned_queue,u8 *addr); -extern struct wlan_network *rtw_get_oldest_wlan_network (struct __queue *scanned_queue); +extern struct wlan_network *rtw_find_network (struct __queue *scanned_queue,u8 *addr); +extern struct wlan_network *rtw_get_oldest_wlan_network (struct __queue *scanned_queue);struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue,struct wlan_network *network); -extern void rtw_free_assoc_resources (struct adapter * adapter,int lock_scanned_queue); -extern void rtw_indicate_disconnect (struct adapter * adapter); -extern void rtw_indicate_connect (struct adapter * adapter); +extern void rtw_free_assoc_resources (struct adapter *adapter,int lock_scanned_queue); +extern void rtw_indicate_disconnect (struct adapter *adapter); +extern void rtw_indicate_connect (struct adapter *adapter);void rtw_indicate_scan_done (struct adapter *padapter,bool aborted);void rtw_scan_abort (struct adapter *adapter);
@@ -600,7 +600,7 @@ extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *extern void _rtw_free_network_nolock (struct mlme_priv *pmlmepriv,struct wlan_network *pnetwork); -extern struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr); +extern struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr);extern sint rtw_if_up (struct adapter *padapter);
drivers/staging/rtl8723bs/include/rtw_mp.h +5 -5
@@ -31,7 +31,7 @@ struct mp_wiparam {u32 io_value; }; -typedef void (*wi_act_func )(void * padapter); +typedef void (*wi_act_func )(void *padapter);struct mp_tx {u8 stop;
@@ -478,13 +478,13 @@ void Hal_SetChannel(struct adapter *padapter);void Hal_SetAntennaPathPower (struct adapter *padapter);s32 Hal_SetThermalMeter (struct adapter *padapter,u8 target_ther);s32 Hal_SetPowerTracking (struct adapter *padapter,u8 enable); -void Hal_GetPowerTracking (struct adapter *padapter,u8 * enable); +void Hal_GetPowerTracking (struct adapter *padapter,u8 *enable);void Hal_GetThermalMeter (struct adapter *padapter,u8 *value);void Hal_mpt_SwitchRfSetting (struct adapter *padapter); -void Hal_MPT_CCKTxPowerAdjust (struct adapter * Adapter,bool bInCH14); +void Hal_MPT_CCKTxPowerAdjust (struct adapter *Adapter,bool bInCH14);void Hal_MPT_CCKTxPowerAdjustbyIndex (struct adapter *padapter,bool beven); -void Hal_SetCCKTxPower (struct adapter *padapter,u8 * TxPower); -void Hal_SetOFDMTxPower (struct adapter *padapter,u8 * TxPower); +void Hal_SetCCKTxPower (struct adapter *padapter,u8 *TxPower); +void Hal_SetOFDMTxPower (struct adapter *padapter,u8 *TxPower);void Hal_TriggerRFThermalMeter (struct adapter *padapter);u8 Hal_ReadRFThermalMeter (struct adapter *padapter);void Hal_SetCCKContinuousTx (struct adapter *padapter,u8 bStart);
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +3 -3
@@ -318,7 +318,7 @@ struct pwrctrl_priv { _rtw_set_pwr_state_check_timer((pwrctl), (pwrctl)->pwr_state_check_interval)extern void rtw_init_pwrctrl_priv (struct adapter *adapter); -extern void rtw_free_pwrctrl_priv (struct adapter * adapter); +extern void rtw_free_pwrctrl_priv (struct adapter *adapter);s32 rtw_register_task_alive (struct adapter *,u32 task);void rtw_unregister_task_alive (struct adapter *,u32 task);
@@ -329,8 +329,8 @@ extern void rtw_unregister_cmd_alive(struct adapter *padapter);extern void cpwm_int_hdl (struct adapter *padapter,struct reportpwrstate_parm *preportpwrstate);extern void LPS_Leave_check (struct adapter *padapter); -extern void LeaveAllPowerSaveMode (struct adapter * Adapter); -extern void LeaveAllPowerSaveModeDirect (struct adapter * Adapter); +extern void LeaveAllPowerSaveMode (struct adapter *Adapter); +extern void LeaveAllPowerSaveModeDirect (struct adapter *Adapter);void _ips_enter (struct adapter *padapter);void ips_enter (struct adapter *padapter);int _ips_leave (struct adapter *padapter);
drivers/staging/rtl8723bs/include/rtw_recv.h +2 -2
@@ -450,7 +450,7 @@ static inline u8 *recvframe_put(union recv_frame *precvframe, sint sz)/* used for append sz bytes from ptr to rx_tail, update rx_tail and return the updated rx_tail to the caller */ /* after putting, rx_tail must be still larger than rx_end. */ -unsigned char * prev_rx_tail; +unsigned char *prev_rx_tail;if (precvframe ==NULL )return NULL ;
@@ -503,7 +503,7 @@ static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem)/* from any given member of recv_frame. */ /* rxmem indicates the any member/address in recv_frame */ -return (union recv_frame *)(((SIZE_PTR )rxmem >>RXFRAME_ALIGN ) <<RXFRAME_ALIGN ); +return (union recv_frame *)(((SIZE_PTR )rxmem >>RXFRAME_ALIGN ) <<RXFRAME_ALIGN ); }
drivers/staging/rtl8723bs/include/rtw_security.h +6 -6
@@ -92,7 +92,7 @@ typedef struct _RT_PMKID_LIST {u8 Bssid[6 ];u8 PMKID [16 ];u8 SsidBuf[33 ]; -u8 * ssid_octet; +u8 *ssid_octet;u16 ssid_length; }RT_PMKID_LIST , *PRT_PMKID_LIST ;
@@ -401,13 +401,13 @@ static const unsigned long K[64] = {#define MIN (x, y) (((x) < (y)) ? (x) : (y))#endif int omac1_aes_128 (u8 *key,u8 *data,size_t data_len,u8 *mac); -void rtw_secmicsetkey (struct mic_data *pmicdata,u8 * key); +void rtw_secmicsetkey (struct mic_data *pmicdata,u8 *key);void rtw_secmicappendbyte (struct mic_data *pmicdata,u8 b); -void rtw_secmicappend (struct mic_data *pmicdata,u8 * src,u32 nBytes); -void rtw_secgetmic (struct mic_data *pmicdata,u8 * dst); +void rtw_secmicappend (struct mic_data *pmicdata,u8 *src,u32 nBytes); +void rtw_secgetmic (struct mic_data *pmicdata,u8 *dst); void rtw_seccalctkipmic( - u8 * key, + u8 *key, u8 *header, u8 *data, u32 data_len,
@@ -424,6 +424,6 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe);u32 rtw_BIP_verify (struct adapter *padapter,u8 *precvframe);void rtw_sec_restore_wep_key (struct adapter *adapter); -u8 rtw_handle_tkip_countermeasure (struct adapter * adapter,const char *caller); +u8 rtw_handle_tkip_countermeasure (struct adapter *adapter,const char *caller);#endif /* __RTL871X_SECURITY_H_ */
drivers/staging/rtl8723bs/include/rtw_xmit.h +4 -4
@@ -183,7 +183,7 @@ struct pkt_attrib {u8 mbssid;u8 ldpc;u8 stbc; -struct sta_info * psta; +struct sta_info *psta;u8 rtsen;u8 cts2self;
@@ -471,7 +471,7 @@ extern u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib);#define rtw_wlan_pkt_size (f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib)extern s32 rtw_xmitframe_coalesce (struct adapter *padapter,_pkt *pkt,struct xmit_frame *pxmitframe);extern s32 rtw_mgmt_xmitframe_coalesce (struct adapter *padapter,_pkt *pkt,struct xmit_frame *pxmitframe); -s32 _rtw_init_hw_txqueue (struct hw_txqueue * phw_txqueue,u8 ac_tag); +s32 _rtw_init_hw_txqueue (struct hw_txqueue *phw_txqueue,u8 ac_tag);void _rtw_init_sta_xmit_priv (struct sta_xmit_priv *psta_xmitpriv);
@@ -501,8 +501,8 @@ u8 qos_acm(u8 acm_mask, u8 priority);void enqueue_pending_xmitbuf (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf);void enqueue_pending_xmitbuf_to_head (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf); -struct xmit_buf *dequeue_pending_xmitbuf (struct xmit_priv *pxmitpriv); -struct xmit_buf *dequeue_pending_xmitbuf_under_survey (struct xmit_priv *pxmitpriv); +struct xmit_buf *dequeue_pending_xmitbuf (struct xmit_priv *pxmitpriv); +struct xmit_buf *dequeue_pending_xmitbuf_under_survey (struct xmit_priv *pxmitpriv);sint check_pending_xmitbuf (struct xmit_priv *pxmitpriv);int rtw_xmit_thread (void *context);
drivers/staging/rtl8723bs/include/sta_info.h +1 -1
@@ -378,7 +378,7 @@ extern u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta);extern void rtw_free_all_stainfo (struct adapter *padapter);extern struct sta_info *rtw_get_stainfo (struct sta_priv *pstapriv,u8 *hwaddr);extern u32 rtw_init_bcmc_stainfo (struct adapter *padapter); -extern struct sta_info *rtw_get_bcmc_stainfo (struct adapter *padapter); +extern struct sta_info *rtw_get_bcmc_stainfo (struct adapter *padapter);extern u8 rtw_access_ctrl (struct adapter *padapter,u8 *mac_addr);#endif /* _STA_INFO_H_ */
drivers/staging/rtl8723bs/include/wifi.h +5 -5
@@ -355,20 +355,20 @@ static inline int IS_MCAST(unsigned char *da)return false; } -static inline unsigned char *get_ra (unsigned char *pframe) +static inline unsigned char *get_ra (unsigned char *pframe) {unsigned char *ra; ra =GetAddr1Ptr (pframe);return ra; } -static inline unsigned char *get_ta (unsigned char *pframe) +static inline unsigned char *get_ta (unsigned char *pframe) {unsigned char *ta; ta =GetAddr2Ptr (pframe);return ta; } -static inline unsigned char *get_da (unsigned char *pframe) +static inline unsigned char *get_da (unsigned char *pframe) {unsigned char *da;unsigned int to_fr_ds = (GetToDs (pframe) <<1 ) |GetFrDs (pframe);
@@ -392,7 +392,7 @@ static inline unsigned char * get_da(unsigned char *pframe) } -static inline unsigned char *get_sa (unsigned char *pframe) +static inline unsigned char *get_sa (unsigned char *pframe) {unsigned char *sa;unsigned int to_fr_ds = (GetToDs (pframe) <<1 ) |GetFrDs (pframe);
@@ -415,7 +415,7 @@ static inline unsigned char * get_sa(unsigned char *pframe)return sa; } -static inline unsigned char *get_hdr_bssid (unsigned char *pframe) +static inline unsigned char *get_hdr_bssid (unsigned char *pframe) {unsigned char *sa =NULL ;unsigned int to_fr_ds = (GetToDs (pframe) <<1 ) |GetFrDs (pframe);
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +7 -7
@@ -563,7 +563,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pastruct sta_info *psta =NULL , *pbcmc_sta =NULL ;struct adapter *padapter =rtw_netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct security_priv * psecuritypriv = &(padapter->securitypriv); +struct security_priv *psecuritypriv = &(padapter->securitypriv);struct sta_priv *pstapriv = &padapter->stapriv;DBG_8192C ("%s\n" , __func__);
@@ -924,8 +924,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_paramif (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802_1x */ { -struct sta_info * psta, *pbcmc_sta; -struct sta_priv * pstapriv = &padapter->stapriv; +struct sta_info *psta, *pbcmc_sta; +struct sta_priv *pstapriv = &padapter->stapriv;/* DBG_8192C("%s, : dot11AuthAlgrthm == dot11AuthAlgrthm_8021X\n", __func__); */
@@ -2529,8 +2529,8 @@ static const struct net_device_ops rtw_cfg80211_monitor_if_ops = {static int rtw_cfg80211_add_monitor_if (struct adapter *padapter,char *name,struct net_device **ndev) {int ret =0 ; -struct net_device * mon_ndev =NULL ; -struct wireless_dev * mon_wdev =NULL ; +struct net_device *mon_ndev =NULL ; +struct wireless_dev *mon_wdev =NULL ;struct rtw_netdev_priv_indicator *pnpi;struct rtw_wdev_priv *pwdev_priv =adapter_wdev_data (padapter);
@@ -2609,7 +2609,7 @@ static struct wireless_dev * enum nl80211_iftype type, struct vif_params *params) { int ret = 0; -struct net_device * ndev =NULL ; +struct net_device *ndev =NULL ;struct adapter *padapter =wiphy_to_adapter (wiphy); DBG_871X(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n",
@@ -2911,7 +2911,7 @@ static int cfg80211_rtw_change_bss(struct wiphy *wiphy, struct net_device *ndev,return 0 ; } -void rtw_cfg80211_rx_action (struct adapter *adapter,u8 *frame,uint frame_len,const char *msg) +void rtw_cfg80211_rx_action (struct adapter *adapter,u8 *frame,uint frame_len,const char *msg) {s32 freq;int channel;
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +4 -4
@@ -78,7 +78,7 @@ void rtw_indicate_wx_disassoc_event(struct adapter *padapter) }static char *translate_scan (struct adapter *padapter, -struct iw_request_info * info,struct wlan_network *pnetwork, +struct iw_request_info *info,struct wlan_network *pnetwork,char *start,char *stop) {struct iw_event iwe;
@@ -765,7 +765,7 @@ static int rtw_wx_get_name(struct net_device *dev,u8 ht_cap = false, vht_cap = false;struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; -NDIS_802_11_RATES_EX * prates =NULL ; +NDIS_802_11_RATES_EX *prates =NULL ;RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("cmd_code =%x\n" , info->cmd));
@@ -937,7 +937,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev,u8 j, blInserted = false;int intReturn = false;struct security_priv *psecuritypriv = &padapter->securitypriv; -struct iw_pmksa * pPMK = (struct iw_pmksa *)extra; +struct iw_pmksa *pPMK = (struct iw_pmksa *)extra;u8 strZeroMacAddress[ETH_ALEN ] = {0x00 };u8 strIssueBssid[ETH_ALEN ] = {0x00 };
@@ -3430,7 +3430,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,struct sta_info *psta =NULL , *pbcmc_sta =NULL ;struct adapter *padapter =rtw_netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct security_priv * psecuritypriv = &(padapter->securitypriv); +struct security_priv *psecuritypriv = &(padapter->securitypriv);struct sta_priv *pstapriv = &padapter->stapriv;DBG_871X ("%s\n" , __func__);
drivers/staging/rtl8723bs/os_dep/recv_linux.c +5 -5
@@ -33,7 +33,7 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv)sint i;union recv_frame *precvframe; - precvframe = (union recv_frame *) precvpriv->precv_frame_buf; + precvframe = (union recv_frame *) precvpriv->precv_frame_buf;for (i =0 ; i <NR_RECVFRAME ; i++) {if (precvframe->u.hdr.pkt) {
@@ -97,7 +97,7 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8void rtw_os_recv_indicate_pkt (struct adapter *padapter,_pkt *pkt,struct rx_pkt_attrib *pattrib) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int ret;/* Indicate the packets to upper layer */
@@ -117,7 +117,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt }if (psta) { -struct net_device *pnetdev = (struct net_device *)padapter->pnetdev; +struct net_device *pnetdev = (struct net_device *)padapter->pnetdev;/* skb->ip_summed = CHECKSUM_NONE; */ pkt->dev = pnetdev;skb_set_queue_mapping (pkt,rtw_recv_select_queue (pkt));
@@ -165,7 +165,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)enum nl80211_key_type key_type =0 ;union iwreq_data wrqu;struct iw_michaelmicfailure ev; -struct mlme_priv * pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct security_priv *psecuritypriv = &padapter->securitypriv;unsigned long cur_time =0 ;
@@ -218,7 +218,7 @@ static void rtw_os_ksocket_send(struct adapter *padapter, union recv_frame *precif (psta && psta->isrc && psta->pid >0 ) {u16 rx_pid; - rx_pid = *(u16 *)(skb->data+ETH_HLEN ); + rx_pid = *(u16 *)(skb->data+ETH_HLEN );DBG_871X ("eth rx(pid = 0x%x): sta(%pM) pid = 0x%x\n" , rx_pid,MAC_ARG (psta->hwaddr), psta->pid);
Signature · 1 line
2.25.1
PATCH 10/10 staging: rtl8723bs: clean up leading space
In reply to Ross SchmidtConvert spaces to tabs to fix coding style issues and clear checkpatch warnings.
WARNING: please, no spaces at the start of a line
--- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 80 +++++++++---------- .../staging/rtl8723bs/os_dep/osdep_service.c | 2 +- 2 files changed, 41 insertions(+), 41 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +40 -40
@@ -985,23 +985,23 @@ static int rtw_wx_set_pmkid(struct net_device *dev,if (psecuritypriv->PMKIDIndex ==16 ) psecuritypriv->PMKIDIndex =0 ; } - }else if (pPMK->cmd ==IW_PMKSA_REMOVE ) { -DBG_871X ("[rtw_wx_set_pmkid] IW_PMKSA_REMOVE!\n" ); - intReturn = true; + }else if (pPMK->cmd ==IW_PMKSA_REMOVE ) { +DBG_871X ("[rtw_wx_set_pmkid] IW_PMKSA_REMOVE!\n" ); + intReturn = true;for (j =0 ; j <NUM_PMKID_CACHE ; j++) {if (!memcmp (psecuritypriv->PMKIDList[j].Bssid, strIssueBssid,ETH_ALEN )) {/* BSSID is matched, the same AP => Remove this PMKID information and reset it. */ -eth_zero_addr (psecuritypriv->PMKIDList[j].Bssid); - psecuritypriv->PMKIDList[j].bUsed = false; +eth_zero_addr (psecuritypriv->PMKIDList[j].Bssid); + psecuritypriv->PMKIDList[j].bUsed = false;break ; } } - }else if (pPMK->cmd ==IW_PMKSA_FLUSH ) { -DBG_871X ("[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n" ); -memset (&psecuritypriv->PMKIDList[0 ],0x00 ,sizeof (RT_PMKID_LIST ) *NUM_PMKID_CACHE ); - psecuritypriv->PMKIDIndex =0 ; - intReturn = true; - } + }else if (pPMK->cmd ==IW_PMKSA_FLUSH ) { +DBG_871X ("[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n" ); +memset (&psecuritypriv->PMKIDList[0 ],0x00 ,sizeof (RT_PMKID_LIST ) *NUM_PMKID_CACHE ); + psecuritypriv->PMKIDIndex =0 ; + intReturn = true; + }return intReturn; }
@@ -2222,8 +2222,8 @@ static int rtw_wx_get_nick(struct net_device *dev, }static int rtw_wx_read32 (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {struct adapter *padapter;struct iw_point *p;
@@ -2282,8 +2282,8 @@ static int rtw_wx_read32(struct net_device *dev, }static int rtw_wx_write32 (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {struct adapter *padapter =rtw_netdev_priv (dev);
@@ -2319,8 +2319,8 @@ static int rtw_wx_write32(struct net_device *dev, }static int rtw_wx_read_rf (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {struct adapter *padapter =rtw_netdev_priv (dev);u32 path, addr, data32;
@@ -2340,8 +2340,8 @@ static int rtw_wx_read_rf(struct net_device *dev, }static int rtw_wx_write_rf (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {struct adapter *padapter =rtw_netdev_priv (dev);u32 path, addr, data32;
@@ -2375,8 +2375,8 @@ static int dummy(struct net_device *dev, struct iw_request_info *a, }static int rtw_wx_set_channel_plan (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {struct adapter *padapter =rtw_netdev_priv (dev);u8 channel_plan_req = (u8)(*((int *)wrqu));
@@ -2425,8 +2425,8 @@ static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info, }static int rtw_get_ap_info (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {int ret =0 ;int wpa_ielen;
@@ -2523,8 +2523,8 @@ static int rtw_get_ap_info(struct net_device *dev, }static int rtw_set_pid (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {int ret =0 ;
@@ -2552,8 +2552,8 @@ static int rtw_set_pid(struct net_device *dev, }static int rtw_wps_start (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {int ret =0 ;
@@ -2582,8 +2582,8 @@ static int rtw_wps_start(struct net_device *dev, }static int rtw_p2p_set (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {return 0 ;
@@ -2591,8 +2591,8 @@ static int rtw_p2p_set(struct net_device *dev, }static int rtw_p2p_get (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {return 0 ;
@@ -2609,8 +2609,8 @@ static int rtw_p2p_get2(struct net_device *dev, }static int rtw_rereg_nd_name (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {int ret =0 ;struct adapter *padapter =rtw_netdev_priv (dev);
@@ -2658,8 +2658,8 @@ static int rtw_rereg_nd_name(struct net_device *dev, }static int rtw_dbg_port (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {u8 major_cmd, minor_cmd;u16 arg;
@@ -3014,7 +3014,7 @@ static int rtw_dbg_port(struct net_device *dev, pregistrypriv->ldpc_cap = (u8)(extra_arg&0x33 ); } } -break ; +break ;case 0x1a : {struct registry_priv *pregistrypriv = &padapter->registrypriv;
@@ -3029,7 +3029,7 @@ static int rtw_dbg_port(struct net_device *dev, pregistrypriv->stbc_cap = (u8)(extra_arg&0x33 ); } } -break ; +break ;case 0x1b : {struct registry_priv *pregistrypriv = &padapter->registrypriv;
@@ -3065,7 +3065,7 @@ static int rtw_dbg_port(struct net_device *dev, } } } -break ; +break ;case 0x1c :/* enable/disable driver control AMPDU Density for peer sta's rx */ {if (arg ==0 ) {
@@ -4409,8 +4409,8 @@ static int rtw_wx_set_priv(struct net_device *dev, }static int rtw_pm_set (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) +struct iw_request_info *info, +union iwreq_data *wrqu,char *extra) {int ret =0 ;unsigned mode =0 ;
drivers/staging/rtl8723bs/os_dep/osdep_service.c +1 -1
@@ -272,7 +272,7 @@ void *rtw_cbuf_pop(struct rtw_cbuf *cbuf)if (rtw_cbuf_empty (cbuf))return NULL ; -DBG_871X ("%s on %u\n" , __func__, cbuf->read); +DBG_871X ("%s on %u\n" , __func__, cbuf->read); buf = cbuf->bufs[cbuf->read]; cbuf->read = (cbuf->read +1 ) % cbuf->size;
Signature · 1 line
2.25.1