staging: rtl8723bs: Fix coding style
cover staging: rtl8723bs: Fix coding style
Fix the coding style issues. Reported by checkpatch
Ian To (2):
staging: rtl8723bs: fix spacing complaints
staging: rtl8723bs: break up lines
drivers/staging/rtl8723bs/core/rtw_xmit.c | 182 ++++++++++++---------- 1 file changed, 103 insertions(+), 79 deletions(-)
Signature · 1 line
2.45.3
PATCH 1/2 staging: rtl8723bs: fix spacing complaints
Fix complaints related to spacing reported by checkpatch.
Signed-off-by Ian To <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 111 +++++++++++----------- 1 file changed, 56 insertions(+), 55 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +56 -55
@@ -78,7 +78,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) } pxmitpriv->pxmit_frame_buf = (u8 *)N_BYTE_ALIGMENT ((SIZE_PTR )(pxmitpriv->pallocated_frame_buf),4 ); - pxframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf; + pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;for (i =0 ; i <NR_XMITFRAME ; i++) {INIT_LIST_HEAD (&pxframe->list);
@@ -248,7 +248,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->pend = pxmitbuf->pbuf +MAX_CMDBUF_SZ ; pxmitbuf->len =0 ; pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; - pxmitbuf->alloc_sz =MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ ; + pxmitbuf->alloc_sz =MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ ; } }
@@ -274,7 +274,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) {int i;struct adapter *padapter = pxmitpriv->adapter; -struct xmit_frame *pxmitframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf; +struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;rtw_hal_free_xmit_priv (padapter);
@@ -401,7 +401,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *u8 HTOpMode = pmlmeinfo->HT_protection;if ((pmlmeext->cur_bwmode && (HTOpMode ==2 || HTOpMode ==3 )) || - (!pmlmeext->cur_bwmode && HTOpMode ==3 )) { + (!pmlmeext->cur_bwmode && HTOpMode ==3 )) { pattrib->vcs_mode =RTS_CTS ;break ; }
@@ -558,7 +558,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pmemcpy (pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey,16 );if (pattrib->encrypt && - ((padapter->securitypriv.sw_encrypt) || (!psecuritypriv->hw_decrypted))) + ((padapter->securitypriv.sw_encrypt) || (!psecuritypriv->hw_decrypted))) pattrib->bswenc = true;else pattrib->bswenc = false;
@@ -636,7 +636,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pmemcpy (pattrib->src, ðerhdr.h_source,ETH_ALEN );if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { + (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) {memcpy (pattrib->ra, pattrib->dst,ETH_ALEN );memcpy (pattrib->ta, pattrib->src,ETH_ALEN ); }else if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {
@@ -661,7 +661,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (pktfile.pkt_len >282 ) {/* MINIMUM_DHCP_PACKET_SIZE) { */ if (pattrib->ether_type ==ETH_P_IP ) {/* IP header */ if (((tmp[21 ] ==68 ) && (tmp[23 ] ==67 )) || - ((tmp[21 ] ==67 ) && (tmp[23 ] ==68 ))) { + ((tmp[21 ] ==67 ) && (tmp[23 ] ==68 ))) {/* 68 : UDP BOOTP client */ /* 67 : UDP BOOTP server */ pattrib->dhcp_pkt =1 ;
@@ -736,7 +736,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p pattrib->subtype =WIFI_DATA_TYPE ; pattrib->priority =0 ; -if (check_fwstate (pmlmepriv,WIFI_AP_STATE |WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) { +if (check_fwstate (pmlmepriv,WIFI_AP_STATE |WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) {if (pattrib->qos_en)set_qos (&pktfile, pattrib); }else {
@@ -787,15 +787,15 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrrtw_secmicsetkey (&micdata, &pattrib->dot11tkiptxmickey.skey[0 ]); } -if (pframe[1 ]&1 ) {/* ToDS == 1 */ +if (pframe[1 ] &1 ) {/* ToDS == 1 */ rtw_secmicappend (&micdata, &pframe[16 ],6 );/* DA */ -if (pframe[1 ]&2 )/* From Ds == 1 */ +if (pframe[1 ] &2 )/* From Ds == 1 */ rtw_secmicappend (&micdata, &pframe[24 ],6 );else rtw_secmicappend (&micdata, &pframe[10 ],6 ); }else {/* ToDS == 0 */ rtw_secmicappend (&micdata, &pframe[4 ],6 );/* DA */ -if (pframe[1 ]&2 )/* From Ds == 1 */ +if (pframe[1 ] &2 )/* From Ds == 1 */ rtw_secmicappend (&micdata, &pframe[16 ],6 );else rtw_secmicappend (&micdata, &pframe[10 ],6 );
@@ -810,16 +810,16 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrfor (curfragnum =0 ; curfragnum < pattrib->nr_frags; curfragnum++) { payload = (u8 *)round_up ((SIZE_PTR )(payload),4 ); - payload = payload+pattrib->hdrlen+pattrib->iv_len; + payload = payload + pattrib->hdrlen + pattrib->iv_len; -if ((curfragnum+1 ) == pattrib->nr_frags) { - length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-((pattrib->bswenc) ? pattrib->icv_len :0 ); +if ((curfragnum +1 ) == pattrib->nr_frags) { + length = pattrib->last_txcmdsz - pattrib->hdrlen - pattrib->iv_len - ((pattrib->bswenc) ? pattrib->icv_len :0 );rtw_secmicappend (&micdata, payload, length); - payload = payload+length; + payload = payload + length; }else { - length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-((pattrib->bswenc) ? pattrib->icv_len :0 ); + length = pxmitpriv->frag_len - pattrib->hdrlen - pattrib->iv_len - ((pattrib->bswenc) ? pattrib->icv_len :0 );rtw_secmicappend (&micdata, payload, length); - payload = payload+length+pattrib->icv_len; + payload = payload + length + pattrib->icv_len; } }rtw_secgetmic (&micdata, &mic[0 ]);
@@ -963,11 +963,11 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (SN_LESS (pattrib->seqnum, tx_seq)) { pattrib->ampdu_en = false;/* AGG BK */ }else if (SN_EQUAL (pattrib->seqnum, tx_seq)) { - psta->BA_starting_seqctrl[pattrib->priority &0x0f ] = (tx_seq+1 )&0xfff ; + psta->BA_starting_seqctrl[pattrib->priority &0x0f ] = (tx_seq +1 ) &0xfff ; pattrib->ampdu_en = true;/* AGG EN */ }else { - psta->BA_starting_seqctrl[pattrib->priority &0x0f ] = (pattrib->seqnum+1 )&0xfff ; + psta->BA_starting_seqctrl[pattrib->priority &0x0f ] = (pattrib->seqnum +1 ) &0xfff ; pattrib->ampdu_en = true;/* AGG EN */ } }
@@ -985,9 +985,9 @@ s32 rtw_txframes_pending(struct adapter *padapter)struct xmit_priv *pxmitpriv = &padapter->xmitpriv;return ((!list_empty (&pxmitpriv->be_pending.queue)) || - (!list_empty (&pxmitpriv->bk_pending.queue)) || - (!list_empty (&pxmitpriv->vi_pending.queue)) || - (!list_empty (&pxmitpriv->vo_pending.queue))); + (!list_empty (&pxmitpriv->bk_pending.queue)) || + (!list_empty (&pxmitpriv->vi_pending.queue)) || + (!list_empty (&pxmitpriv->vo_pending.queue))); }/*
@@ -1105,7 +1105,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structif (bmcst || (rtw_endofpktfile (&pktfile) == true)) { pattrib->nr_frags = frg_inx; - pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags ==1 ) ? llc_sz:0 ) + + pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags ==1 ) ? llc_sz :0 ) + ((pattrib->bswenc) ? pattrib->icv_len :0 ) + mem_sz;ClearMFrag (mem_start);
@@ -1155,7 +1155,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s mem_start = pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct ieee80211_hdr *)pframe; - ori_len =BIP_AAD_SIZE +pattrib->pktlen; + ori_len =BIP_AAD_SIZE + pattrib->pktlen; tmp_buf =BIP_AAD =rtw_zmalloc (ori_len); subtype =GetFrameSubType (pframe);/* bit(7)~bit(2) */
@@ -1206,20 +1206,20 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, sClearPwrMgt (BIP_AAD );ClearMData (BIP_AAD );/* conscruct AAD, copy address 1 to address 3 */ -memcpy (BIP_AAD +2 , pwlanhdr->addr1,18 ); +memcpy (BIP_AAD +2 , pwlanhdr->addr1,18 );/* copy management fram body */ -memcpy (BIP_AAD +BIP_AAD_SIZE , MGMT_body, frame_body_len); +memcpy (BIP_AAD +BIP_AAD_SIZE , MGMT_body, frame_body_len);/* calculate mic */ if (omac1_aes_128 (padapter->securitypriv.dot11wBIPKey[padapter->securitypriv.dot11wBIPKeyid].skey - ,BIP_AAD ,BIP_AAD_SIZE +frame_body_len, mic)) + ,BIP_AAD ,BIP_AAD_SIZE + frame_body_len, mic)) goto xmitframe_coalesce_fail;/* copy right BIP mic value, total is 128bits, we use the 0~63 bits */ -memcpy (pframe-8 , mic,8 ); +memcpy (pframe -8 , mic,8 ); }else {/* unicast mgmt frame TX */ /* start to encrypt mgmt frame */ if (subtype ==WIFI_DEAUTH || subtype ==WIFI_DISASSOC || - subtype ==WIFI_REASSOCREQ || subtype ==WIFI_ACTION ) { + subtype ==WIFI_REASSOCREQ || subtype ==WIFI_ACTION ) {if (pattrib->psta) psta = pattrib->psta;else
@@ -1233,11 +1233,11 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s/* according 802.11-2012 standard, these five types are not robust types */ if (subtype ==WIFI_ACTION && - (pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_PUBLIC || - pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_HT || - pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_UNPROTECTED_WNM || - pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_SELF_PROTECTED || - pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_P2P )) + (pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_PUBLIC || + pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_HT || + pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_UNPROTECTED_WNM || + pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_SELF_PROTECTED || + pframe[WLAN_HDR_A3_LEN ] ==RTW_WLAN_CATEGORY_P2P )) goto xmitframe_coalesce_fail;/* before encrypt dump the management packet content */ if (pattrib->encrypt >0 )
@@ -1266,7 +1266,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s/* copy mgmt data portion after CCMP header */ memcpy (pframe, tmp_buf+pattrib->hdrlen, pattrib->pktlen-pattrib->hdrlen);/* move pframe to end of mgmt pkt */ - pframe += pattrib->pktlen-pattrib->hdrlen; + pframe += pattrib->pktlen - pattrib->hdrlen;/* add 8 bytes CCMP IV header to length */ pattrib->pktlen += pattrib->iv_len;if ((pattrib->icv_len >0 ) && (pattrib->bswenc)) {
@@ -1372,7 +1372,7 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe,struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 pkt_num =1 ; -if ((pxmitframe->frame_tag&0x0f ) ==DATA_FRAMETAG ) { +if ((pxmitframe->frame_tag &0x0f ) ==DATA_FRAMETAG ) { pkt_num = pxmitframe->agg_num; pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pkt_num;
@@ -1393,7 +1393,7 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, }static struct xmit_buf *__rtw_alloc_cmd_xmitbuf (struct xmit_priv *pxmitpriv, -enum cmdbuf_type buf_type) +enum cmdbuf_type buf_type) {struct xmit_buf *pxmitbuf =NULL ;
@@ -1414,7 +1414,7 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpriv, }struct xmit_frame *__rtw_alloc_cmdxmitframe (struct xmit_priv *pxmitpriv, -enum cmdbuf_type buf_type) +enum cmdbuf_type buf_type) {struct xmit_frame *pcmdframe;struct xmit_buf *pxmitbuf;
@@ -2010,7 +2010,8 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe)return allow; } -signed int xmitframe_enqueue_for_sleeping_sta (struct adapter *padapter,struct xmit_frame *pxmitframe) +signed int xmitframe_enqueue_for_sleeping_sta (struct adapter *padapter, +struct xmit_frame *pxmitframe) {signed int ret = false;struct sta_info *psta =NULL ;
@@ -2072,7 +2073,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xspin_lock_bh (&psta->sleep_q.lock); -if (psta->state&WIFI_SLEEP_STATE ) { +if (psta->state &WIFI_SLEEP_STATE ) {u8 wmmps_ac =0 ;if (pstapriv->sta_dz_bitmap &BIT (psta->aid)) {
@@ -2085,20 +2086,20 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xswitch (pattrib->priority) {case 1 :case 2 : - wmmps_ac = psta->uapsd_bk&BIT (0 ); + wmmps_ac = psta->uapsd_bk &BIT (0 );break ;case 4 :case 5 : - wmmps_ac = psta->uapsd_vi&BIT (0 ); + wmmps_ac = psta->uapsd_vi &BIT (0 );break ;case 6 :case 7 : - wmmps_ac = psta->uapsd_vo&BIT (0 ); + wmmps_ac = psta->uapsd_vo &BIT (0 );break ;case 0 :case 3 :default : - wmmps_ac = psta->uapsd_be&BIT (0 ); + wmmps_ac = psta->uapsd_be &BIT (0 );break ; }
@@ -2216,20 +2217,20 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)switch (pxmitframe->attrib.priority) {case 1 :case 2 : - wmmps_ac = psta->uapsd_bk&BIT (1 ); + wmmps_ac = psta->uapsd_bk &BIT (1 );break ;case 4 :case 5 : - wmmps_ac = psta->uapsd_vi&BIT (1 ); + wmmps_ac = psta->uapsd_vi &BIT (1 );break ;case 6 :case 7 : - wmmps_ac = psta->uapsd_vo&BIT (1 ); + wmmps_ac = psta->uapsd_vo &BIT (1 );break ;case 0 :case 3 :default : - wmmps_ac = psta->uapsd_be&BIT (1 ); + wmmps_ac = psta->uapsd_be &BIT (1 );break ; }
@@ -2261,7 +2262,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) pstapriv->tim_bitmap &= ~BIT (psta->aid); -if (psta->state&WIFI_SLEEP_STATE ) +if (psta->state &WIFI_SLEEP_STATE ) psta->state ^=WIFI_SLEEP_STATE ;if (psta->state &WIFI_STA_ALIVE_CHK_STATE ) {
@@ -2276,7 +2277,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)if (!psta_bmc) goto _exit; -if ((pstapriv->sta_dz_bitmap&0xfffe ) ==0x0 ) {/* no any sta in ps mode */ +if ((pstapriv->sta_dz_bitmap &0xfffe ) ==0x0 ) {/* no any sta in ps mode */ xmitframe_phead =get_list_head (&psta_bmc->sleep_q);list_for_each_safe (xmitframe_plist, tmp, xmitframe_phead) { pxmitframe = list_entry(xmitframe_plist,
@@ -2329,20 +2330,20 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pstswitch (pxmitframe->attrib.priority) {case 1 :case 2 : - wmmps_ac = psta->uapsd_bk&BIT (1 ); + wmmps_ac = psta->uapsd_bk &BIT (1 );break ;case 4 :case 5 : - wmmps_ac = psta->uapsd_vi&BIT (1 ); + wmmps_ac = psta->uapsd_vi &BIT (1 );break ;case 6 :case 7 : - wmmps_ac = psta->uapsd_vo&BIT (1 ); + wmmps_ac = psta->uapsd_vo &BIT (1 );break ;case 0 :case 3 :default : - wmmps_ac = psta->uapsd_be&BIT (1 ); + wmmps_ac = psta->uapsd_be &BIT (1 );break ; }
@@ -2452,7 +2453,7 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey(struct xmit_priv *pxmitpri type =GetFrameSubType (pxmitbuf->pbuf +TXDESC_OFFSET );if ((type ==WIFI_PROBEREQ ) || - (type ==WIFI_DATA_NULL ) || + (type ==WIFI_DATA_NULL ) || (type ==WIFI_QOS_DATA_NULL )) {list_del_init (&pxmitbuf->list);break ;
Signature · 1 line
2.45.3
PATCH 2/2 staging: rtl8723bs: break up lines
In reply to Ian ToBreak up lines that are too long. Reported by checkpatch.
Signed-off-by Ian To <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 71 +++++++++++++++-------- 1 file changed, 47 insertions(+), 24 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +47 -24
@@ -126,10 +126,12 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->buf_tag =XMITBUF_DATA ;/* Tx buf allocation may fail sometimes, so sleep and retry. */ - res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf, (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ ), true); + res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf, + (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ ), true);if (res == _FAIL) {msleep (10 ); - res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf, (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ ), true); + res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf, + (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ ), true);if (res == _FAIL) goto exit; }
@@ -208,7 +210,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->padapter = padapter; pxmitbuf->buf_tag =XMITBUF_MGNT ; - res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf,MAX_XMIT_EXTBUF_SZ +XMITBUF_ALIGN_SZ , true); + res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf, +MAX_XMIT_EXTBUF_SZ +XMITBUF_ALIGN_SZ , true);if (res == _FAIL) { res = _FAIL; goto exit;
@@ -238,7 +241,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->padapter = padapter; pxmitbuf->buf_tag =XMITBUF_CMD ; - res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf,MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ , true); + res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf, +MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ , true);if (res == _FAIL) { res = _FAIL; goto exit;
@@ -289,7 +293,8 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) }for (i =0 ; i <NR_XMITBUFF ; i++) { -rtw_os_xmit_resource_free (padapter, pxmitbuf, (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ ), true); +rtw_os_xmit_resource_free (padapter, pxmitbuf, + (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ ), true); pxmitbuf++; }
@@ -311,7 +316,8 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)/* free xmit extension buff */ pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;for (i =0 ; i <NR_XMIT_EXTBUFF ; i++) { -rtw_os_xmit_resource_free (padapter, pxmitbuf, (MAX_XMIT_EXTBUF_SZ +XMITBUF_ALIGN_SZ ), true); +rtw_os_xmit_resource_free (padapter, pxmitbuf, + (MAX_XMIT_EXTBUF_SZ +XMITBUF_ALIGN_SZ ), true); pxmitbuf++; }
@@ -321,7 +327,8 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)for (i =0 ; i <CMDBUF_MAX ; i++) { pxmitbuf = &pxmitpriv->pcmd_xmitbuf[i];if (pxmitbuf) -rtw_os_xmit_resource_free (padapter, pxmitbuf,MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ , true); +rtw_os_xmit_resource_free (padapter, pxmitbuf, +MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ , true); }rtw_free_hwxmits (padapter);
@@ -380,8 +387,9 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * }else {while (true) {/* IOT action */ -if ((pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_ATHEROS ) && (pattrib->ampdu_en == true) && - (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { +if ((pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_ATHEROS ) && + (pattrib->ampdu_en == true) && + (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { pattrib->vcs_mode =CTS_TO_SELF ;break ; }
@@ -431,7 +439,8 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * pattrib->vcs_mode = padapter->driver_vcs_type; } -static void update_attrib_phy_info (struct adapter *padapter,struct pkt_attrib *pattrib,struct sta_info *psta) +static void update_attrib_phy_info (struct adapter *padapter,struct pkt_attrib *pattrib, +struct sta_info *psta) {struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv;
@@ -467,7 +476,8 @@ static void update_attrib_phy_info(struct adapter *padapter, struct pkt_attrib * pattrib->retry_ctrl = false; } -static s32 update_attrib_sec_info (struct adapter *padapter,struct pkt_attrib *pattrib,struct sta_info *psta) +static s32 update_attrib_sec_info (struct adapter *padapter,struct pkt_attrib *pattrib, +struct sta_info *psta) {signed int res = _SUCCESS;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -481,7 +491,8 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pif (psta->ieee8021x_blocked == true) { pattrib->encrypt =0 ; -if ((pattrib->ether_type !=0x888e ) && (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == false)) { +if ((pattrib->ether_type !=0x888e ) && + (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == false)) { res = _FAIL; goto exit; }
@@ -506,7 +517,8 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p }/* For WPS 1.0 WEP, driver should not encrypt EAPOL Packet for WPS handshake. */ -if (((pattrib->encrypt == _WEP40_) || (pattrib->encrypt == _WEP104_)) && (pattrib->ether_type ==0x888e )) +if (((pattrib->encrypt == _WEP40_) || (pattrib->encrypt == _WEP104_)) && + (pattrib->ether_type ==0x888e )) pattrib->encrypt = _NO_PRIVACY_; }
@@ -700,7 +712,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (!psta) {/* if we cannot get psta => drop the pkt */ res = _FAIL; goto exit; - }else if ((check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) && (!(psta->state & _FW_LINKED))) { + }else if ((check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) && + (!(psta->state & _FW_LINKED))) { res = _FAIL; goto exit; }
@@ -771,7 +784,8 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrif (pattrib->encrypt == _TKIP_) {/* encode mic code */ { -u8 null_key[16 ] = {0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 }; +u8 null_key[16 ] = {0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 , +0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 }; pframe = pxmitframe->buf_addr + hw_hdr_offset;
@@ -1017,7 +1031,8 @@ u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib)* 5. move frag chunk from pframe to pxmitframe->mem * 6. apply sw-encrypt, if necessary. */ -s32 rtw_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt,struct xmit_frame *pxmitframe) +s32 rtw_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt, +struct xmit_frame *pxmitframe) {struct pkt_file pktfile;
@@ -1136,7 +1151,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct }/* broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption */ -s32 rtw_mgmt_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt,struct xmit_frame *pxmitframe) +s32 rtw_mgmt_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt, +struct xmit_frame *pxmitframe) {u8 *pframe, *mem_start =NULL , *tmp_buf =NULL ;u8 subtype;
@@ -1180,7 +1196,8 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, smemset (MME ,0 ,18 );/* other types doesn't need the BIP */ -if (GetFrameSubType (pframe) !=WIFI_DEAUTH &&GetFrameSubType (pframe) !=WIFI_DISASSOC ) +if (GetFrameSubType (pframe) !=WIFI_DEAUTH && +GetFrameSubType (pframe) !=WIFI_DISASSOC ) goto xmitframe_coalesce_fail; MGMT_body = pframe +sizeof (struct ieee80211_hdr_3addr );
@@ -1241,7 +1258,8 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s goto xmitframe_coalesce_fail;/* before encrypt dump the management packet content */ if (pattrib->encrypt >0 ) -memcpy (pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey,16 ); +memcpy (pattrib->dot118021x_UncstKey.skey, + psta->dot118021x_UncstKey.skey,16 );/* bakeup original management packet */ memcpy (tmp_buf, pframe, pattrib->pktlen);/* move to data portion */
@@ -1264,7 +1282,8 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, smemcpy (pframe, pattrib->iv, pattrib->iv_len); pframe += pattrib->iv_len;/* copy mgmt data portion after CCMP header */ -memcpy (pframe, tmp_buf+pattrib->hdrlen, pattrib->pktlen-pattrib->hdrlen); +memcpy (pframe, tmp_buf + pattrib->hdrlen, + pattrib->pktlen - pattrib->hdrlen);/* move pframe to end of mgmt pkt */ pframe += pattrib->pktlen - pattrib->hdrlen;/* add 8 bytes CCMP IV header to length */
@@ -1751,7 +1770,8 @@ s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframreturn _SUCCESS; } -struct tx_servq *rtw_get_sta_pending (struct adapter *padapter,struct sta_info *psta,signed int up,u8 *ac) +struct tx_servq *rtw_get_sta_pending (struct adapter *padapter,struct sta_info *psta, +signed int up,u8 *ac) {struct tx_servq *ptxservq =NULL ;
@@ -2106,7 +2126,8 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter,if (wmmps_ac) psta->sleepq_ac_len++; -if (((psta->has_legacy_ac) && (!wmmps_ac)) || ((!psta->has_legacy_ac) && (wmmps_ac))) { +if (((psta->has_legacy_ac) && (!wmmps_ac)) || + ((!psta->has_legacy_ac) && (wmmps_ac))) {if (!(pstapriv->tim_bitmap &BIT (psta->aid))) update_tim = true;
@@ -2126,7 +2147,8 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter,return ret; } -static void dequeue_xmitframes_to_sleeping_queue (struct adapter *padapter,struct sta_info *psta,struct __queue *pframequeue) +static void dequeue_xmitframes_to_sleeping_queue (struct adapter *padapter,struct sta_info *psta, +struct __queue *pframequeue) {signed int ret;struct list_head *plist, *phead, *tmp;
@@ -2147,7 +2169,8 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc ret =xmitframe_enqueue_for_sleeping_sta (padapter, pxmitframe);if (true == ret) { - ptxservq =rtw_get_sta_pending (padapter, psta, pattrib->priority, (u8 *)(&ac_index)); + ptxservq =rtw_get_sta_pending (padapter, psta, pattrib->priority, + (u8 *)(&ac_index)); ptxservq->qcnt--; phwxmits[ac_index].accnt--;
Signature · 1 line
2.45.3