staging: rtl8723bs: coding style and refactoring cleanups
v3 cover staging: rtl8723bs: coding style and refactoring cleanups
This patch series performs minor refactoring and coding style cleanups in the rtl8723bs driver, focusing on rtw_xmit.c and addressing checkpatch.pl warnings.
---
Changelog:
v2 -> v3: Resubmitted as a versioned series to avoid threading confusion. v1 -> v2: Fixed incorrect commit messages.
Note: I noticed this driver uses a custom N_BYTE_ALIGMENT macro for memory alignment. Would it be acceptable if I send a follow-up patch converting this to PTR_ALIGN since it's more commonly used in the kernel?
Khushal Chitturi (4):
staging: rtl8723bs: fix operator and type cast spacing
staging: rtl8723bs: simplify boolean expressions
staging: rtl8723bs: rename CamelCase identifiers to snake_case
staging: rtl8723bs: fix line length and alignment issues
drivers/staging/rtl8723bs/core/rtw_cmd.c | 17 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 238 +++++++++++-------- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +- 5 files changed, 154 insertions(+), 111 deletions(-)
Signature · 1 line
2.52.0
PATCH v3 1/4 staging: rtl8723bs: fix operator and type cast spacing
Fix spacing around operators and type casts in rtw_xmit.c to comply with the kernel coding style.
---
Changelog:
v2 -> v3: Resubmitting as versioned series.
v1 -> v2: No changes.
drivers/staging/rtl8723bs/core/rtw_xmit.c | 89 +++++++++++++---------- 1 file changed, 50 insertions(+), 39 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +50 -39
@@ -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);
@@ -238,7 +238,9 @@ 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;
@@ -248,7 +250,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 +276,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);
@@ -321,7 +323,9 @@ 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);
@@ -736,7 +740,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 +791,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 +814,20 @@ 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 ]);
@@ -1108,8 +1116,10 @@ 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->bswenc) ? pattrib->icv_len :0 ) + mem_sz; + 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);
@@ -1158,7 +1168,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) */
@@ -1211,14 +1221,14 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s/* conscruct AAD, copy address 1 to address 3 */ memcpy (BIP_AAD +2 , &pwlanhdr->addrs,sizeof (pwlanhdr->addrs));/* 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 ||
@@ -1267,9 +1277,10 @@ 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; + 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)) {
@@ -1375,7 +1386,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;
@@ -2070,7 +2081,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)) {
@@ -2083,20 +2094,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 ; }
@@ -2214,20 +2225,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 ; }
@@ -2259,7 +2270,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 ) {
@@ -2274,7 +2285,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,
@@ -2327,20 +2338,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 ; }
Signature · 1 line
2.52.0
PATCH v3 2/4 staging: rtl8723bs: simplify boolean expressions
In reply to Khushal ChitturiSimplify boolean expressions in rtw_xmit.c to
comply with the kernel coding style
---
Changelog:
v2 -> v3: Resubmitted as a versioned series to avoid threading confusion. v1 -> v2: Corrected commit messages.
drivers/staging/rtl8723bs/core/rtw_xmit.c | 38 ++++++++++++----------- 1 file changed, 20 insertions(+), 18 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +20 -18
@@ -384,7 +384,8 @@ 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) && +if ((pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_ATHEROS ) && + (pattrib->ampdu_en) && (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { pattrib->vcs_mode =CTS_TO_SELF ;break ;
@@ -420,7 +421,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame */* to do list: check MIMO power save condition. */ /* check AMPDU aggregation for TXOP */ -if (pattrib->ampdu_en == true) { +if (pattrib->ampdu_en) { pattrib->vcs_mode =RTS_CTS ;break ; }
@@ -482,10 +483,10 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pmemset (pattrib->dot11tkiptxmickey.skey,0 ,16 ); pattrib->mac_id = psta->mac_id; -if (psta->ieee8021x_blocked == true) { +if (psta->ieee8021x_blocked) { 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 ))) { res = _FAIL; goto exit; }
@@ -639,8 +640,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pmemcpy (pattrib->dst, ðerhdr.h_dest,ETH_ALEN );memcpy (pattrib->src, ðerhdr.h_source,ETH_ALEN ); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { +if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) || + (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) {memcpy (pattrib->ra, pattrib->dst,ETH_ALEN );memcpy (pattrib->ta, pattrib->src,ETH_ALEN ); }else if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {
@@ -704,7 +705,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 )) && + (!(psta->state & _FW_LINKED))) { res = _FAIL; goto exit; }
@@ -880,7 +882,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrSetFrameSubType (fctrl, pattrib->subtype);if (pattrib->subtype &WIFI_DATA_TYPE ) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {/* to_ds = 1, fr_ds = 0; */ {
@@ -894,7 +896,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (pqospriv->qos_option) qos_option = true; - }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) { + }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {/* to_ds = 0, fr_ds = 1; */ SetFrDs (fctrl);memcpy (pwlanhdr->addr1, pattrib->dst,ETH_ALEN );
@@ -903,8 +905,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (pattrib->qos_en) qos_option = true; - }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { + }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) || + (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) {memcpy (pwlanhdr->addr1, pattrib->dst,ETH_ALEN );memcpy (pwlanhdr->addr2, pattrib->src,ETH_ALEN );memcpy (pwlanhdr->addr3,get_bssid (pmlmepriv),ETH_ALEN );
@@ -962,7 +964,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr pattrib->ampdu_en = true;/* re-check if enable ampdu by BA_starting_seqctrl */ -if (pattrib->ampdu_en == true) { +if (pattrib->ampdu_en) {u16 tx_seq; tx_seq = psta->BA_starting_seqctrl[pattrib->priority &0x0f ];
@@ -1113,7 +1115,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct frg_inx++; -if (bmcst || (rtw_endofpktfile (&pktfile) == true)) { +if (bmcst || (rtw_endofpktfile (&pktfile))) { pattrib->nr_frags = frg_inx; pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len +
@@ -1139,7 +1141,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structxmitframe_swencrypt (padapter, pxmitframe); -if (bmcst == false) +if (!bmcst)update_attrib_vcs_info (padapter, pxmitframe);else pattrib->vcs_mode =NONE_VCS ;
@@ -1978,14 +1980,14 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)do_queue_select (padapter, &pxmitframe->attrib);spin_lock_bh (&pxmitpriv->lock); -if (xmitframe_enqueue_for_sleeping_sta (padapter, pxmitframe) == true) { +if (xmitframe_enqueue_for_sleeping_sta (padapter, pxmitframe)) {spin_unlock_bh (&pxmitpriv->lock);return 1 ; }spin_unlock_bh (&pxmitpriv->lock);/* pre_xmitframe */ -if (rtw_hal_xmit (padapter, pxmitframe) == false) +if (!rtw_hal_xmit (padapter, pxmitframe))return 1 ;return 0 ;
@@ -2029,7 +2031,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xsigned int bmcst =is_multicast_ether_addr (pattrib->ra);bool update_tim = false; -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == false) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return ret; psta =rtw_get_stainfo (&padapter->stapriv, pattrib->ra);if (pattrib->psta != psta)
@@ -2154,7 +2156,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc ret =xmitframe_enqueue_for_sleeping_sta (padapter, pxmitframe); -if (true == ret) { +if (ret) { ptxservq =rtw_get_sta_pending (padapter, psta, pattrib->priority, (u8 *)(&ac_index)); ptxservq->qcnt--;
Signature · 1 line
2.52.0
Greg KH
maintainerRe: [PATCH v3 2/4] staging: rtl8723bs: simplify boolean expressions
Quoted 2 lines · Khushal Chitturi
Simplify boolean expressions in
rtw_xmit.cto
comply with the kernel coding style
Please use the full 72 characters on a line.
Quoted 15 lines
Signed-off-by Khushal Chitturi <[email protected]>---
Changelog:
v2 -> v3: Resubmitted as a versioned series to avoid threading confusion. v1 -> v2: Corrected commit messages.drivers/staging/rtl8723bs/core/rtw_xmit.c | 38 ++++++++++++----------- 1 file changed, 20 insertions(+), 18 deletions(-)drivers/staging/rtl8723bs/core/rtw_xmit.c +0
-0
drivers/staging/rtl8723bs/core/rtw_xmit.c static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * · line 388
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +2
-1@@ -384,7 +384,8 @@ 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) && + if ((pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_ATHEROS) && + (pattrib->ampdu_en) &&
You moved this to the next line in the right place, but here:
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr · line 909
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +2
-2@@ -903,8 +905,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (pattrib->qos_en) qos_option = true; - }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { + }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) || + (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) {
You did not? How come?
thanks,
greg k-h
Re: [PATCH v3 2/4] staging: rtl8723bs: simplify boolean expressions
Quoted 32 lines · Greg KH
Quoted 2 lines · Khushal Chitturi
Simplify boolean expressions in
rtw_xmit.cto
comply with the kernel coding stylePlease use the full 72 characters on a line.
Quoted 15 lines
Signed-off-by Khushal Chitturi <[email protected]>---
Changelog:
v2 -> v3: Resubmitted as a versioned series to avoid threading confusion. v1 -> v2: Corrected commit messages.drivers/staging/rtl8723bs/core/rtw_xmit.c | 38 ++++++++++++----------- 1 file changed, 20 insertions(+), 18 deletions(-)drivers/staging/rtl8723bs/core/rtw_xmit.c +0
-0drivers/staging/rtl8723bs/core/rtw_xmit.c static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * · line 388
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +2
-1@@ -384,7 +384,8 @@ 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) && + if ((pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_ATHEROS) && + (pattrib->ampdu_en) &&You moved this to the next line in the right place, but here:
Quoted 2 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +0
-0@@ -903,8 +905,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr · line 909
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +2
-2if (pattrib->qos_en) qos_option = true; - }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { + }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) || + (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) {You did not? How come?
You're right, I missed the alignment in that second block. I will fix it and send a v4.
Signature · 2 lines
Regards, Khushal
PATCH v3 3/4 staging: rtl8723bs: rename CamelCase identifiers to snake_case
In reply to Khushal ChitturiRename several CamelCase identifiers across the driver to follow kernel naming conventions.
The following identifiers were renamed:
1) UserPriority to user_priority
2) NumTxOkInPeriod to tx_ok_in_period
3) HTOpMode to ht_op_mode
---
Changelog:
v2 -> v3: Resubmitted as a versioned series.
v1 -> v2: Corrected commit messages.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 17 ++++++++++------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 17 +++++++++-------- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +++--- 5 files changed, 24 insertions(+), 20 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +10 -7
@@ -1148,10 +1148,11 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) BusyThreshold = BusyThresholdLow;if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { + pmlmepriv->LinkDetectInfo.tx_ok_in_period > BusyThreshold) { bBusyTraffic = true; -if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) +if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > + pmlmepriv->LinkDetectInfo.tx_ok_in_period) bRxBusyTraffic = true;else bTxBusyTraffic = true;
@@ -1159,18 +1160,20 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)/* Higher Tx/Rx data. */ if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod >4000 || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod >4000 ) { + pmlmepriv->LinkDetectInfo.tx_ok_in_period >4000 ) { bHigherBusyTraffic = true; -if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) +if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > + pmlmepriv->LinkDetectInfo.tx_ok_in_period) bHigherBusyRxTraffic = true;else bHigherBusyTxTraffic = true; }/* check traffic for powersaving. */ -if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) >8 ) || - (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >2 )) { +if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + + pmlmepriv->LinkDetectInfo.tx_ok_in_period) >8 ) || + (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >2 )) { bEnterPS = false;if (bBusyTraffic) {
@@ -1214,7 +1217,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) } pmlmepriv->LinkDetectInfo.NumRxOkInPeriod =0 ; - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod =0 ; + pmlmepriv->LinkDetectInfo.tx_ok_in_period =0 ; pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod =0 ; pmlmepriv->LinkDetectInfo.bBusyTraffic = bBusyTraffic; pmlmepriv->LinkDetectInfo.bTxBusyTraffic = bTxBusyTraffic;
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -2518,7 +2518,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfrs32 bmcst =is_multicast_ether_addr (pattrib->ra);/* if (bmcst || (padapter->mlmepriv.LinkDetectInfo.bTxBusyTraffic == false)) */ -if (bmcst || (padapter->mlmepriv.LinkDetectInfo.NumTxOkInPeriod <100 )) +if (bmcst || (padapter->mlmepriv.LinkDetectInfo.tx_ok_in_period <100 ))return ; priority = pattrib->priority;
drivers/staging/rtl8723bs/core/rtw_xmit.c +9 -8
@@ -403,10 +403,11 @@ 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; +u8 ht_op_mode = pmlmeinfo->HT_protection; -if ((pmlmeext->cur_bwmode && (HTOpMode ==2 || HTOpMode ==3 )) || - (!pmlmeext->cur_bwmode && HTOpMode ==3 )) { +if ((pmlmeext->cur_bwmode && + (ht_op_mode ==2 || ht_op_mode ==3 )) || + (!pmlmeext->cur_bwmode && ht_op_mode ==3 )) { pattrib->vcs_mode =RTS_CTS ;break ; }
@@ -605,17 +606,17 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) {struct ethhdr etherhdr;struct iphdr ip_hdr; -s32 UserPriority =0 ; +s32 user_priority =0 ;_rtw_open_pktfile (ppktfile->pkt, ppktfile);_rtw_pktfile_read (ppktfile, (unsigned char *)ðerhdr,ETH_HLEN ); -/* get UserPriority from IP hdr */ +/* get user_priority from IP hdr */ if (pattrib->ether_type ==0x0800 ) {_rtw_pktfile_read (ppktfile, (u8 *)&ip_hdr,sizeof (ip_hdr)); - UserPriority = ip_hdr.tos >>5 ; + user_priority = ip_hdr.tos >>5 ; } - pattrib->priority = UserPriority; + pattrib->priority = user_priority; pattrib->hdrlen =WLAN_HDR_A3_QOS_LEN ; pattrib->subtype =WIFI_QOS_DATA_TYPE ; }
@@ -1391,7 +1392,7 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe,if ((pxmitframe->frame_tag &0x0f ) ==DATA_FRAMETAG ) { pkt_num = pxmitframe->agg_num; - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pkt_num; + pmlmepriv->LinkDetectInfo.tx_ok_in_period += pkt_num; pxmitpriv->tx_pkts += pkt_num;
drivers/staging/rtl8723bs/hal/hal_btcoex.c +1 -1
@@ -366,7 +366,7 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)struct rt_link_detect_t *plinkinfo; plinkinfo = &padapter->mlmepriv.LinkDetectInfo; -if (plinkinfo->NumTxOkInPeriod > plinkinfo->NumRxOkInPeriod) +if (plinkinfo->tx_ok_in_period > plinkinfo->NumRxOkInPeriod) *pU4Tmp =BTC_WIFI_TRAFFIC_TX ;else *pU4Tmp =BTC_WIFI_TRAFFIC_RX ;
drivers/staging/rtl8723bs/include/rtw_mlme.h +3 -3
@@ -93,9 +93,9 @@ struct sitesurvey_ctrl { };struct rt_link_detect_t { -u32 NumTxOkInPeriod; -u32 NumRxOkInPeriod; -u32 NumRxUnicastOkInPeriod; +u32 tx_ok_in_period; +u32 NumRxOkInPeriod; +u32 NumRxUnicastOkInPeriod;bool bBusyTraffic;bool bTxBusyTraffic;bool bRxBusyTraffic;
Signature · 1 line
2.52.0
Greg KH
maintainerRe: [PATCH v3 3/4] staging: rtl8723bs: rename CamelCase identifiers to snake_case
Quoted 6 lines · Khushal Chitturi
Rename several CamelCase identifiers across the driver to follow kernel naming conventions.
The following identifiers were renamed:
1) UserPriority touser_priority
2) NumTxOkInPeriod totx_ok_in_period
Why did you drop the "num"? That has a meaning, right? Now this variable looks like a boolean, not a count.
thanks,
greg k-h
Re: [PATCH v3 3/4] staging: rtl8723bs: rename CamelCase identifiers to snake_case
Quoted 10 lines · Greg KH
Quoted 6 lines · Khushal Chitturi
Rename several CamelCase identifiers across the driver to follow kernel naming conventions.
The following identifiers were renamed:
1) UserPriority touser_priority
2) NumTxOkInPeriod totx_ok_in_periodWhy did you drop the "num"? That has a meaning, right? Now this variable looks like a boolean, not a count.
Yes, dropping "num" was a mistake.
I'll replace it with num_tx_ok_in_period in v4.
Signature · 2 lines
Regards, Khushal
PATCH v3 4/4 staging: rtl8723bs: fix line length and alignment issues
In reply to Khushal ChitturiFix multiple coding style issues in rtw_xmit.c to comply with the kernel coding style by splitting expressions and adjusting alignment.
This patch resolves checkpatch.pl warnings caused by line length exceeding 100 columns and alignment matching the open parenthesis.
---
Changelog:
v2 -> v3: Resubmitted as a versioned series to resolve threading confusion. v1 -> v2: No changes.
drivers/staging/rtl8723bs/core/rtw_xmit.c | 94 +++++++++++++++-------- 1 file changed, 60 insertions(+), 34 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +60 -34
@@ -126,10 +126,14 @@ 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 +212,9 @@ 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;
@@ -291,7 +297,9 @@ 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++; }
@@ -313,7 +321,9 @@ 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++; }
@@ -367,7 +377,9 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * sz = pattrib->last_txcmdsz;/* (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. */ +/* (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. */ if (pmlmeext->cur_wireless_mode <WIRELESS_11_24N || padapter->registrypriv.wifi_spec) {
@@ -437,7 +449,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;
@@ -465,7 +478,8 @@ static void update_attrib_phy_info(struct adapter *padapter, struct pkt_attrib * pattrib->ch_offset = psta->htpriv.ch_offset; pattrib->ampdu_en = false; -if (padapter->driver_ampdu_spacing !=0xFF )/* driver control AMPDU Density for peer sta's rx */ +/* driver control AMPDU Density for peer sta's rx */ +if (padapter->driver_ampdu_spacing !=0xFF ) pattrib->ampdu_spacing = padapter->driver_ampdu_spacing;else pattrib->ampdu_spacing = psta->htpriv.rx_ampdu_min_spacing;
@@ -473,7 +487,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;
@@ -512,7 +527,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_; }
@@ -564,7 +580,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;
@@ -656,7 +672,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p pattrib->pktlen = pktfile.pkt_len;if (pattrib->ether_type ==ETH_P_IP ) { -/* The following is for DHCP and ARP packet, we use cck1M to tx these packets and let LPS awake some time */ +/* The following is for DHCP and ARP packet, +* we use cck1M to tx these packets and let LPS awake some time +*/ /* to prevent DHCP protocol fail */ u8 tmp[24 ];
@@ -667,7 +685,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 ;
@@ -778,7 +796,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;
@@ -999,9 +1018,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))); }/*
@@ -1031,7 +1050,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;
@@ -1152,7 +1172,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;
@@ -1235,7 +1256,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s }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
@@ -1249,11 +1270,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 )
@@ -1410,7 +1431,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 ;
@@ -1431,7 +1452,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;
@@ -1768,7 +1789,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 ;
@@ -2022,7 +2044,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 ;
@@ -2117,7 +2140,8 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xif (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;
@@ -2137,7 +2161,8 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xreturn 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;
@@ -2158,7 +2183,8 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc ret =xmitframe_enqueue_for_sleeping_sta (padapter, pxmitframe);if (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--;
@@ -2464,8 +2490,8 @@ 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_QOS_DATA_NULL )) { + (type ==WIFI_DATA_NULL ) || + (type ==WIFI_QOS_DATA_NULL )) {list_del_init (&pxmitbuf->list);break ; }
Signature · 1 line
2.52.0
Greg KH
maintainerRe: [PATCH v3 4/4] staging: rtl8723bs: fix line length and alignment issues
drivers/staging/rtl8723bs/core/rtw_xmit.c static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * · line 382
Quoted 5 lines · Khushal Chitturi
drivers/staging/rtl8723bs/core/rtw_xmit.c +3
-1/* (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. */ +/* (2) If there are more than one frag in this MSDU, +* only the first frag uses protection frame. +*/
Break a sentance on the line length, not the ',' character.
Otherwise, you get odd looking lines like this one:
drivers/staging/rtl8723bs/core/rtw_xmit.c static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p · line 677
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +3
-1@@ -656,7 +672,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p pattrib->pktlen = pktfile.pkt_len;if (pattrib->ether_type ==ETH_P_IP ) { -/* The following is for DHCP and ARP packet, we use cck1M to tx these packets and let LPS awake some time */ +/* The following is for DHCP and ARP packet, +* we use cck1M to tx these packets and let LPS awake some time +*/
Thanks,
greg k-h
Re: [PATCH v3 4/4] staging: rtl8723bs: fix line length and alignment issues
Quoted 10 lines · Greg KH
drivers/staging/rtl8723bs/core/rtw_xmit.c static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * · line 382
Quoted 5 lines · Khushal Chitturi
/* (1)
RTS_Thresholdis compared to the MPDU, not MSDU. */drivers/staging/rtl8723bs/core/rtw_xmit.c +3
-1-/* (2) If there are more than one frag in this MSDU, only the first frag uses protection frame. */ +/* (2) If there are more than one frag in this MSDU, +* only the first frag uses protection frame. +*/ Break a sentance on the line length, not the ',' character.
Otherwise, you get odd looking lines like this one:
Thanks for pointing that out, I'll fix it in v4.
Signature · 2 lines
Regards, Khushal