staging: rtl8723bs: coding style and refactoring cleanups
cover staging: rtl8723bs: coding style and refactoring cleanups
This patch series refactors the rtl8723bs driver,
focusing on rtw_xmit.c and addressing most of the
checkpatch.pl warnings.
---
Khushal Chitturi (9):
staging: rtl8723bs: fix operator and type cast spacing
staging: rtl8723bs: remove empty branches
staging: rtl8723bs: simplify boolean expressions
staging: rtl8723bs: replace msleep with usleep_range in rtw_xmit.c
staging: rtl8723bs: split chained assignments
staging: rtl8723bs: rename struct members to snake_case
staging: rtl8723bs: rename local variables to snake_case
staging: rtl8723bs: replace N_BYTE_ALIGMENT with PTR_ALIGN
staging: rtl8723bs: fix line length and alignment issues
drivers/staging/rtl8723bs/core/rtw_ap.c | 26 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 66 ++-- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 16 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 48 +-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 106 +++--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 34 +- drivers/staging/rtl8723bs/core/rtw_security.c | 38 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 338 ++++++++++-------- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 32 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 16 +- .../staging/rtl8723bs/include/rtw_security.h | 36 +- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 30 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 176 ++++----- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 18 +- 25 files changed, 526 insertions(+), 488 deletions(-)
Signature · 1 line
2.52.0
PATCH 1/9 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.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 76 +++++++++++------------ 1 file changed, 38 insertions(+), 38 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +38 -38
@@ -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,7 @@ 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 +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);
@@ -321,7 +321,7 @@ 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 +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 ]);
@@ -1108,7 +1108,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);
@@ -1158,7 +1158,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 +1211,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 +1267,9 @@ 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 +1375,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 +2070,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 +2083,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 +2214,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 +2259,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 +2274,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 +2327,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 2/9 staging: rtl8723bs: remove empty branches
In reply to Khushal ChitturiRemove empty else blocks in rtw_xmit.c to improve
readability and follow the kernel coding style.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +3 -5
@@ -1707,8 +1707,6 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram queue = &pxmitpriv->free_xmit_queue; else if (pxmitframe->ext_tag == 1) queue = &pxmitpriv->free_xframe_ext_queue; - else { - }spin_lock_bh (&queue->lock);
@@ -1999,11 +1997,11 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe) ) allow = true; - }else if (registry->hiq_filter ==RTW_HIQ_FILTER_ALLOW_ALL ) + }else if (registry->hiq_filter ==RTW_HIQ_FILTER_ALLOW_ALL ) { allow = true; -else if (registry->hiq_filter ==RTW_HIQ_FILTER_DENY_ALL ) { - }else + }else {rtw_warn_on (1 ); + }return allow; }
Signature · 1 line
2.52.0
Re: [PATCH 2/9] staging: rtl8723bs: remove empty branches
Quoted 23 lines · Khushal Chitturi
Remove empty else blocks in
rtw_xmit.cto improve
readability and follow the kernel coding style.Signed-off-by Khushal Chitturi <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/staging/rtl8723bs/core/rtw_xmit.c +0
-2@@ -1707,8 +1707,6 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram queue = &pxmitpriv->free_xmit_queue; else if (pxmitframe->ext_tag == 1) queue = &pxmitpriv->free_xframe_ext_queue; - else { - }spin_lock_bh (&queue->lock);@@ -1999,11 +1997,11 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe) )
drivers/staging/rtl8723bs/core/rtw_xmit.c inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe) · line 2004
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +3
-3allow = true; - }else if (registry->hiq_filter ==RTW_HIQ_FILTER_ALLOW_ALL ) + }else if (registry->hiq_filter ==RTW_HIQ_FILTER_ALLOW_ALL ) { allow = true; -else if (registry->hiq_filter ==RTW_HIQ_FILTER_DENY_ALL ) { - }else + }else {rtw_warn_on (1 ); + }
Please be more careful. I'm not going to review the other patches.
regards,
dan carpenter
PATCH 3/9 staging: rtl8723bs: simplify boolean expressions
In reply to Khushal ChitturiSimplify boolean expressions in rtw_xmit.c to
comply with the kernel coding style
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +18 -18
@@ -380,7 +380,7 @@ 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 ;
@@ -416,7 +416,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 ; }
@@ -478,10 +478,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; }
@@ -635,8 +635,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 )) {
@@ -700,7 +700,7 @@ 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; }
@@ -872,7 +872,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; */ {
@@ -886,7 +886,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 );
@@ -895,8 +895,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 );
@@ -954,7 +954,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 ];
@@ -1105,7 +1105,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 + ((pattrib->nr_frags == 1) ? llc_sz : 0) +
@@ -1129,7 +1129,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 ;
@@ -1965,14 +1965,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 ;
@@ -2016,7 +2016,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)
@@ -2141,7 +2141,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
Re: [PATCH 3/9] staging: rtl8723bs: simplify boolean expressions
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt) · line 1975
Quoted 13 lines · Khushal Chitturi
drivers/staging/rtl8723bs/core/rtw_xmit.c +2
-2do_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))
You reversed this if statement. Really, just please throw this patchset away and restart from scratch. This wasn't my only complaint about this patch but the other was more of a style issue and I think you will fix it if you go slower.
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt) · line 1978
Quoted 3 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +0
-0return 1 ;return 0 ;
regards,
dan carpenter
PATCH 4/9 staging: rtl8723bs: replace msleep with usleep_range in rtw_xmit.c
In reply to Khushal ChitturiReplace msleep(10) with usleep_range(10000,11000) during xmit buffer reallocation, as msleep() is not suitable for short delays below 20ms.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -128,7 +128,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)/* 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);if (res == _FAIL) { -msleep (10 ); +usleep_range (10000 ,11000 ); res =rtw_os_xmit_resource_alloc (padapter, pxmitbuf, (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ ), true);if (res == _FAIL) goto exit;
Signature · 1 line
2.52.0
PATCH 5/9 staging: rtl8723bs: split chained assignments
In reply to Khushal ChitturiSplit chained assignments in rtw_xmit.c into separate statements to improve readability and comply with the kernel coding style.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +12 -6
@@ -137,7 +137,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_XMITBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; pxmitbuf->flags =XMIT_VO_QUEUE ;
@@ -217,7 +218,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_XMIT_EXTBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead;list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmit_extbuf_queue.queue);
@@ -247,7 +249,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_CMDBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; pxmitbuf->alloc_sz =MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ ; } }
@@ -1155,11 +1158,13 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, su8 MME [_MME_IE_LENGTH_];u32 ori_len; - mem_start = pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; + mem_start = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; + pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct ieee80211_hdr *)pframe; ori_len =BIP_AAD_SIZE + pattrib->pktlen; - tmp_buf =BIP_AAD =rtw_zmalloc (ori_len); + tmp_buf =rtw_zmalloc (ori_len); +BIP_AAD =rtw_zmalloc (ori_len); subtype =GetFrameSubType (pframe);/* bit(7)~bit(2) */ if (!BIP_AAD )
@@ -1405,7 +1410,8 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpriv, pxmitbuf->priv_data =NULL ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; pxmitbuf->agg_num =0 ; pxmitbuf->pg_num =0 ;
Signature · 1 line
2.52.0
Re: [PATCH 5/9] staging: rtl8723bs: split chained assignments
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s · line 1167
Quoted 13 lines · Khushal Chitturi
drivers/staging/rtl8723bs/core/rtw_xmit.c +4
-2@@ -1155,11 +1158,13 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, su8 MME [_MME_IE_LENGTH_];u32 ori_len; - mem_start = pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; + mem_start = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; + pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct ieee80211_hdr *)pframe; ori_len =BIP_AAD_SIZE + pattrib->pktlen; - tmp_buf =BIP_AAD =rtw_zmalloc (ori_len); + tmp_buf =rtw_zmalloc (ori_len); +BIP_AAD =rtw_zmalloc (ori_len);
Nope. We don't want two allocations.
regards,
dan carpenter
PATCH 6/9 staging: rtl8723bs: rename struct members to snake_case
In reply to Khushal ChitturiRename CamelCase struct members in rtw_xmit.c and related files to snake_case to follow the kernel naming conventions.
These identifiers are used across multiple files, so this patch ensures consistent naming throughout the driver.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 26 +-- drivers/staging/rtl8723bs/core/rtw_cmd.c | 66 +++---- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 16 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 48 ++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 106 +++++------ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 34 ++-- drivers/staging/rtl8723bs/core/rtw_security.c | 38 ++-- .../staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 70 +++---- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 32 ++-- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 16 +- .../staging/rtl8723bs/include/rtw_security.h | 36 ++-- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 30 +-- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 176 +++++++++--------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 18 +- 25 files changed, 373 insertions(+), 373 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +13 -13
@@ -462,7 +462,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* ap mode */ rtw_hal_set_odm_var (padapter,HAL_ODM_STA_INFO , psta, true); -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->ieee8021x_blocked = true;else psta->ieee8021x_blocked = false;
@@ -682,8 +682,8 @@ void start_bss_network(struct adapter *padapter)if (!pmlmepriv->cur_network.join_res) {/* setting only at first time */ /* WEP Key will be set before this function, do not clear CAM. */ -if ((psecuritypriv->dot11PrivacyAlgrthm != _WEP40_) && - (psecuritypriv->dot11PrivacyAlgrthm != _WEP104_)) +if ((psecuritypriv->dot11_privacy_algrthm != _WEP40_) && + (psecuritypriv->dot11_privacy_algrthm != _WEP104_))flush_all_cam_entry (padapter);/* clear CAM */ }
@@ -705,8 +705,8 @@ void start_bss_network(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_BK , (u8 *)(&acparm));/* Set Security */ - val8 = (psecuritypriv->dot11AuthAlgrthm == - dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + val8 = (psecuritypriv->dot11_auth_algrthm == + dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));/* Beacon Control related register */
@@ -925,7 +925,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */ psecuritypriv->wpa_psk |=BIT (1 );
@@ -951,7 +951,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */
@@ -1249,7 +1249,7 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)memcpy (psetstakey_para->addr, psta->hwaddr,ETH_ALEN ); -memcpy (psetstakey_para->key, &psta->dot118021x_UncstKey,16 ); +memcpy (psetstakey_para->key, &psta->dot11_8021x_uncst_key,16 ); res =rtw_enqueue_cmd (pcmdpriv, ph2c);
@@ -1972,12 +1972,12 @@ void rtw_ap_restore_network(struct adapter *padapter)start_bss_network (padapter); -if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) || - (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { +if ((padapter->securitypriv.dot11_privacy_algrthm == _TKIP_) || + (padapter->securitypriv.dot11_privacy_algrthm == _AES_)) {/* restore group key, WEP keys is restored in ips_leave() */ rtw_set_key (padapter, psecuritypriv, - psecuritypriv->dot118021XGrpKeyid, + psecuritypriv->dot11_8021x_grp_key_id,0 , false); }
@@ -2008,8 +2008,8 @@ void rtw_ap_restore_network(struct adapter *padapter)Update_RA_Entry (padapter, psta);/* pairwise key */ /* per sta pairwise key and settings */ -if ((psecuritypriv->dot11PrivacyAlgrthm == _TKIP_) || - (psecuritypriv->dot11PrivacyAlgrthm == _AES_)) { +if ((psecuritypriv->dot11_privacy_algrthm == _TKIP_) || + (psecuritypriv->dot11_privacy_algrthm == _AES_)) {rtw_setstakey_cmd (padapter, psta, true, false); } }
drivers/staging/rtl8723bs/core/rtw_cmd.c +33 -33
122 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +8 -8
@@ -61,7 +61,7 @@ u8 rtw_do_join(struct adapter *padapter)/* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty */ /* we try to issue sitesurvey firstly */ -if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false +if (pmlmepriv->link_detect_info.bBusyTraffic == false ||rtw_to_roam (padapter) >0 ) {/* submit site_survey_cmd */
@@ -113,7 +113,7 @@ u8 rtw_do_join(struct adapter *padapter)/* when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue */ /* we try to issue sitesurvey firstly */ -if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false +if (pmlmepriv->link_detect_info.bBusyTraffic == false ||rtw_to_roam (padapter) >0 ) { ret =rtw_sitesurvey_cmd (padapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 );
@@ -380,7 +380,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s }if ((check_fwstate (pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) || - (pmlmepriv->LinkDetectInfo.bBusyTraffic == true)) { + (pmlmepriv->link_detect_info.bBusyTraffic == true)) {/* Scan or linking is in progress, do nothing. */ res = true;
@@ -408,7 +408,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11 psecuritypriv->ndisauthtype = authmode;if (psecuritypriv->ndisauthtype >3 ) - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; res =rtw_set_auth (padapter, psecuritypriv);
@@ -436,13 +436,13 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)switch (wep->key_length) {case 5 : - psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; + psecuritypriv->dot11_privacy_algrthm = _WEP40_;break ;case 13 : - psecuritypriv->dot11PrivacyAlgrthm = _WEP104_; + psecuritypriv->dot11_privacy_algrthm = _WEP104_;break ;default : - psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; + psecuritypriv->dot11_privacy_algrthm = _NO_PRIVACY_;break ; }
@@ -450,7 +450,7 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep) psecuritypriv->dot11DefKeylen[keyid] = wep->key_length; - psecuritypriv->dot11PrivacyKeyIndex = keyid; + psecuritypriv->dot11_privacy_key_index = keyid; res =rtw_set_key (padapter, psecuritypriv, keyid,1 , true);
drivers/staging/rtl8723bs/core/rtw_mlme.c +24 -24
130 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +53 -53
306 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +2 -2
@@ -210,7 +210,7 @@ void traffic_check_for_leave_lps(struct adapter *padapter, u8 tx, u32 tx_packets } }else {/* from rx path */ -if (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >4 /*2*/ ) { +if (pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod >4 /*2*/ ) {if (adapter_to_pwrctl (padapter)->bLeisurePs && (adapter_to_pwrctl (padapter)->pwr_mode !=PS_MODE_ACTIVE ) && !(hal_btcoex_IsBtControlLps (padapter)))
@@ -325,7 +325,7 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) )return false; -if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x && !padapter->securitypriv.binstallGrpkey)return false;
drivers/staging/rtl8723bs/core/rtw_recv.c +17 -17
@@ -380,7 +380,7 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p/* rxdata_key_idx =(((iv[3])>>6)&0x3) ; */ mickey = &psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0 ]; -/* psecuritypriv->dot118021XGrpKeyid, pmlmeinfo->key_index, rxdata_key_idx); */ +/* psecuritypriv->dot11_8021x_grp_key_id, pmlmeinfo->key_index, rxdata_key_idx); */ if (psecuritypriv->binstallGrpkey == false) { res = _FAIL;
@@ -408,7 +408,7 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *pif (bmic_err == true) {/* double check key_index for some timing issue , */ -/* cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue */ +/* cannot compare with psecuritypriv->dot11_8021x_grp_key_id also cause timing issue */ if ((is_multicast_ether_addr (prxattrib->ra) == true) && (prxattrib->key_index != pmlmeinfo->key_index)) brpt_micerror = false;
@@ -452,12 +452,12 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *pswitch (prxattrib->encrypt) {case _WEP40_:case _WEP104_: - prxattrib->key_index = psecuritypriv->dot11PrivacyKeyIndex; + prxattrib->key_index = psecuritypriv->dot11_privacy_key_index;break ;case _TKIP_:case _AES_:default : - prxattrib->key_index = psecuritypriv->dot118021XGrpKeyid; + prxattrib->key_index = psecuritypriv->dot11_8021x_grp_key_id;break ; } }
@@ -512,7 +512,7 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre pstapriv = &adapter->stapriv; - auth_alg = adapter->securitypriv.dot11AuthAlgrthm; + auth_alg = adapter->securitypriv.dot11_auth_algrthm; ptr = precv_frame->u.hdr.rx_data; pfhdr = &precv_frame->u.hdr;
@@ -680,10 +680,10 @@ static void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, sz =get_recvframe_len (prframe); precvpriv->rx_bytes += sz; - padapter->mlmepriv.LinkDetectInfo.NumRxOkInPeriod++; + padapter->mlmepriv.link_detect_info.NumRxOkInPeriod++;if ((!is_broadcast_ether_addr (pattrib->dst)) && (!is_multicast_ether_addr (pattrib->dst))) - padapter->mlmepriv.LinkDetectInfo.NumRxUnicastOkInPeriod++; + padapter->mlmepriv.link_detect_info.NumRxUnicastOkInPeriod++;if (sta) psta = sta;
@@ -840,7 +840,7 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p goto exit; } -if (GetFrameSubType (ptr) &BIT (6 )) { +if (get_frame_sub_type (ptr) &BIT (6 )) {/* No data, will not indicate to upper layer, temporily count it here */ count_rx_stats (adapter, precv_frame, *psta); ret =RTW_RX_HANDLED ;
@@ -920,10 +920,10 @@ static signed int sta2ap_data_frame(struct adapter *adapter, union recv_frame *pprocess_pwrbit_data (adapter, precv_frame); -if ((GetFrameSubType (ptr) &WIFI_QOS_DATA_TYPE ) ==WIFI_QOS_DATA_TYPE ) +if ((get_frame_sub_type (ptr) &WIFI_QOS_DATA_TYPE ) ==WIFI_QOS_DATA_TYPE )process_wmmps_data (adapter, precv_frame); -if (GetFrameSubType (ptr) &BIT (6 )) { +if (get_frame_sub_type (ptr) &BIT (6 )) {/* No data, will not indicate to upper layer, temporily count it here */ count_rx_stats (adapter, precv_frame, *psta); ret =RTW_RX_HANDLED ;
@@ -968,7 +968,7 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_ psta->sta_stats.rx_ctrl_pkts++;/* only handle ps-poll */ -if (GetFrameSubType (pframe) ==WIFI_PSPOLL ) { +if (get_frame_sub_type (pframe) ==WIFI_PSPOLL ) {u16 aid;u8 wmmps_ac =0 ;
@@ -1261,11 +1261,11 @@ static signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_if (psta) { psta->sta_stats.rx_mgnt_pkts++; -if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_BEACON ) +if (get_frame_sub_type (precv_frame->u.hdr.rx_data) ==WIFI_BEACON ) psta->sta_stats.rx_beacon_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBEREQ ) +else if (get_frame_sub_type (precv_frame->u.hdr.rx_data) ==WIFI_PROBEREQ ) psta->sta_stats.rx_probereq_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBERSP ) { +else if (get_frame_sub_type (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)) ||
@@ -1405,11 +1405,11 @@ static signed int validate_80211w_mgmt(struct adapter *adapter, union recv_frameu8 *ptr = precv_frame->u.hdr.rx_data;u8 subtype; - subtype =GetFrameSubType (ptr);/* bit(7)~bit(2) */ + subtype =get_frame_sub_type (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) { + adapter->securitypriv.b_install_bip_key == true) {/* unicast management frame decrypt */ if (pattrib->privacy && !(is_multicast_ether_addr (GetAddr1Ptr (ptr))) && (subtype ==WIFI_DEAUTH || subtype ==WIFI_DISASSOC || subtype ==WIFI_ACTION )) {
@@ -1497,7 +1497,7 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_frame } type =GetFrameType (ptr); - subtype =GetFrameSubType (ptr);/* bit(7)~bit(2) */ + subtype =get_frame_sub_type (ptr);/* bit(7)~bit(2) */ pattrib->to_fr_ds =get_tofr_ds (ptr);
drivers/staging/rtl8723bs/core/rtw_security.c +19 -19
@@ -57,12 +57,12 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)/* start to encrypt each fragment */ if ((pattrib->encrypt == _WEP40_) || (pattrib->encrypt == _WEP104_)) { - keylength = psecuritypriv->dot11DefKeylen[psecuritypriv->dot11PrivacyKeyIndex]; + keylength = psecuritypriv->dot11DefKeylen[psecuritypriv->dot11_privacy_key_index];for (curfragnum =0 ; curfragnum < pattrib->nr_frags; curfragnum++) { iv = pframe + pattrib->hdrlen;memcpy (&wepkey[0 ], iv,3 ); -memcpy (&wepkey[3 ], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0 ], keylength); +memcpy (&wepkey[3 ], &psecuritypriv->dot11DefKey[psecuritypriv->dot11_privacy_key_index].skey[0 ], keylength); payload = pframe + pattrib->iv_len + pattrib->hdrlen;if ((curfragnum +1 ) == pattrib->nr_frags) {/* the last fragment */
@@ -110,7 +110,7 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe) keyindex = prxattrib->key_index; keylength = psecuritypriv->dot11DefKeylen[keyindex];memcpy (&wepkey[0 ], iv,3 ); -/* memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0], keylength); */ +/* memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11_privacy_key_index].skey[0], keylength); */ memcpy (&wepkey[3 ], &psecuritypriv->dot11DefKey[keyindex].skey[0 ], keylength); length = ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len;
@@ -479,9 +479,9 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe) {if (is_multicast_ether_addr (pattrib->ra)) - prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; + prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot11_8021x_grp_key_id].skey;else - prwskey = pattrib->dot118021x_UncstKey.skey; + prwskey = pattrib->dot11_8021x_uncst_key.skey;for (curfragnum =0 ; curfragnum < pattrib->nr_frags; curfragnum++) { iv = pframe + pattrib->hdrlen;
@@ -590,7 +590,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; }else { - prwskey = &stainfo->dot118021x_UncstKey.skey[0 ]; + prwskey = &stainfo->dot11_8021x_uncst_key.skey[0 ]; } iv = pframe + prxattrib->hdrlen;
@@ -829,7 +829,7 @@ static signed int aes_cipher(u8 *key, uint hdrlen,u8 padded_buffer[16 ] = {};u8 mic[8 ];uint frtype =GetFrameType (pframe); -uint frsubtype =GetFrameSubType (pframe); +uint frsubtype =get_frame_sub_type (pframe); frsubtype = frsubtype >>4 ;
@@ -993,9 +993,9 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)/* 4 start to encrypt each fragment */ if (pattrib->encrypt == _AES_) {if (is_multicast_ether_addr (pattrib->ra)) - prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; + prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot11_8021x_grp_key_id].skey;else - prwskey = pattrib->dot118021x_UncstKey.skey; + prwskey = pattrib->dot11_8021x_uncst_key.skey;for (curfragnum =0 ; curfragnum < pattrib->nr_frags; curfragnum++) {if ((curfragnum +1 ) == pattrib->nr_frags) {/* 4 the last fragment */
@@ -1034,7 +1034,7 @@ static signed int aes_decipher(u8 *key, uint hdrlen,u8 mic[8 ];uint frtype =GetFrameType (pframe); -uint frsubtype =GetFrameSubType (pframe); +uint frsubtype =get_frame_sub_type (pframe); frsubtype = frsubtype >>4 ;
@@ -1282,12 +1282,12 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) no_gkey_mc_cnt =0 ; prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; -if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) { +if (psecuritypriv->dot11_8021x_grp_key_id != prxattrib->key_index) { res = _FAIL; goto exit; } }else { - prwskey = &stainfo->dot118021x_UncstKey.skey[0 ]; + prwskey = &stainfo->dot11_8021x_uncst_key.skey[0 ]; } length = ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len;
@@ -1343,7 +1343,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)/* copy key index */ memcpy (&le_tmp, p +2 ,2 ); keyid =le16_to_cpu (le_tmp); -if (keyid != padapter->securitypriv.dot11wBIPKeyid) +if (keyid != padapter->securitypriv.dot11w_bip_key_id) goto BIP_exit;/* clear the MIC field of MME to zero */
@@ -1351,13 +1351,13 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)/* conscruct AAD, copy frame control field */ memcpy (BIP_AAD , &pwlanhdr->frame_control,2 ); -ClearRetry (BIP_AAD ); -ClearPwrMgt (BIP_AAD ); -ClearMData (BIP_AAD ); +clear_retry (BIP_AAD ); +clear_pwr_mgt (BIP_AAD ); +clear_m_data (BIP_AAD );/* conscruct AAD, copy address 1 to address 3 */ memcpy (BIP_AAD +2 , &pwlanhdr->addrs,sizeof (pwlanhdr->addrs)); -if (omac1_aes_128 (padapter->securitypriv.dot11wBIPKey[padapter->securitypriv.dot11wBIPKeyid].skey +if (omac1_aes_128 (padapter->securitypriv.dot11w_bip_key[padapter->securitypriv.dot11w_bip_key_id].skey ,BIP_AAD , ori_len, mic)) goto BIP_exit;
@@ -1488,10 +1488,10 @@ void rtw_sec_restore_wep_key(struct adapter *adapter)struct security_priv *securitypriv = &(adapter->securitypriv);signed int keyid; -if ((_WEP40_ == securitypriv->dot11PrivacyAlgrthm) || (_WEP104_ == securitypriv->dot11PrivacyAlgrthm)) { +if ((_WEP40_ == securitypriv->dot11_privacy_algrthm) || (_WEP104_ == securitypriv->dot11_privacy_algrthm)) {for (keyid =0 ; keyid <4 ; keyid++) {if (securitypriv->key_mask &BIT (keyid)) { -if (keyid == securitypriv->dot11PrivacyKeyIndex) +if (keyid == securitypriv->dot11_privacy_key_index)rtw_set_key (adapter, securitypriv, keyid,1 , false);else rtw_set_key (adapter, securitypriv, keyid,0 , false);
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -1141,7 +1141,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) pmlmepriv->NumOfBcnInfoChkFail =0 ; } - subtype =GetFrameSubType (pframe) >>4 ; + subtype =get_frame_sub_type (pframe) >>4 ;if (subtype ==WIFI_BEACON ) bssid->reserved[0 ] =1 ;
drivers/staging/rtl8723bs/core/rtw_xmit.c +35 -35
214 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/hal_btcoex.c +4 -4
@@ -167,7 +167,7 @@ static u8 halbtcoutsrc_IsWifiBusy(struct adapter *padapter)if (check_fwstate (pmlmepriv,WIFI_ASOC_STATE ) == true) {if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true)return true; -if (pmlmepriv->LinkDetectInfo.bBusyTraffic) +if (pmlmepriv->link_detect_info.bBusyTraffic)return true; }
@@ -325,7 +325,7 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)break ;case BTC_GET_BL_WIFI_ENABLE_ENCRYPTION : - *pu8 = padapter->securitypriv.dot11PrivacyAlgrthm !=0 ; + *pu8 = padapter->securitypriv.dot11_privacy_algrthm !=0 ;break ;case BTC_GET_BL_WIFI_UNDER_B_MODE :
@@ -364,9 +364,9 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)case BTC_GET_U4_WIFI_TRAFFIC_DIRECTION : {struct rt_link_detect_t *plinkinfo; - plinkinfo = &padapter->mlmepriv.LinkDetectInfo; + plinkinfo = &padapter->mlmepriv.link_detect_info; -if (plinkinfo->NumTxOkInPeriod > plinkinfo->NumRxOkInPeriod) +if (plinkinfo->num_tx_ok_in_period > plinkinfo->NumRxOkInPeriod) *pU4Tmp =BTC_WIFI_TRAFFIC_TX ;else *pU4Tmp =BTC_WIFI_TRAFFIC_RX ;
drivers/staging/rtl8723bs/hal/hal_com.c +1 -1
@@ -593,7 +593,7 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)if (val) {/* Enable default key related setting */ reg_scr |=SCR_TXBCUSEDK ; -if (sec->dot11AuthAlgrthm != dot11AuthAlgrthm_8021X) +if (sec->dot11_auth_algrthm != dot11_auth_algrthm_8021x) reg_scr |= (SCR_RxUseDK|SCR_TxUseDK); }else /* Disable default key related setting */ reg_scr &= ~(SCR_RXBCUSEDK |SCR_TXBCUSEDK |SCR_RxUseDK|SCR_TxUseDK);
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -1
@@ -160,7 +160,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe)/* pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; */ /* memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN); */ -if (padapter->securitypriv.binstallBIPkey == true) { +if (padapter->securitypriv.b_install_bip_key == true) {if (is_multicast_ether_addr (pmgntframe->attrib.ra)) { pmgntframe->attrib.encrypt = _BIP_;/* pmgntframe->attrib.bswenc = true; */
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +16 -16
@@ -121,9 +121,9 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)));ether_addr_copy (pwlanhdr->addr3,get_my_bssid (cur_network)); -SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ ); +set_seq_num (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ );/* pmlmeext->mgnt_seq++; */ -SetFrameSubType (pframe,WIFI_BEACON ); +set_frame_sub_type (pframe,WIFI_BEACON ); pframe +=sizeof (struct ieee80211_hdr_3addr ); pktlen =sizeof (struct ieee80211_hdr_3addr );
@@ -204,7 +204,7 @@ static void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength) fctrl = &(pwlanhdr->frame_control); *(fctrl) =0 ;SetPwrMgt (fctrl); -SetFrameSubType (pframe,WIFI_PSPOLL ); +set_frame_sub_type (pframe,WIFI_PSPOLL );/* AID. */ SetDuration (pframe, (pmlmeinfo->aid |0xc000 ));
@@ -246,13 +246,13 @@ static void ConstructNullFunctionData(switch (cur_network->network.infrastructure_mode) {case Ndis802_11Infrastructure: -SetToDs (fctrl); +set_to_ds (fctrl);ether_addr_copy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)));ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)));ether_addr_copy (pwlanhdr->addr3, StaAddr);break ;case Ndis802_11APMode: -SetFrDs (fctrl); +set_fr_ds (fctrl);ether_addr_copy (pwlanhdr->addr1, StaAddr);ether_addr_copy (pwlanhdr->addr2,get_my_bssid (&(pmlmeinfo->network)));ether_addr_copy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)));
@@ -265,20 +265,20 @@ static void ConstructNullFunctionData(break ; } -SetSeqNum (pwlanhdr,0 ); +set_seq_num (pwlanhdr,0 );if (bQoS) {struct ieee80211_qos_hdr *pwlanqoshdr; -SetFrameSubType (pframe,WIFI_QOS_DATA_NULL ); +set_frame_sub_type (pframe,WIFI_QOS_DATA_NULL ); pwlanqoshdr = (struct ieee80211_qos_hdr *)pframe; -SetPriority (&pwlanqoshdr->qos_ctrl,AC ); -SetEOSP (&pwlanqoshdr->qos_ctrl, bEosp); +set_priority (&pwlanqoshdr->qos_ctrl,AC ); +set_eosp (&pwlanqoshdr->qos_ctrl, bEosp); pktlen =sizeof (struct ieee80211_qos_hdr ); }else { -SetFrameSubType (pframe,WIFI_DATA_NULL ); +set_frame_sub_type (pframe,WIFI_DATA_NULL ); pktlen =sizeof (struct ieee80211_hdr_3addr ); }
@@ -765,26 +765,26 @@ static void ConstructBtNullFunctionData(if (bForcePowerSave)SetPwrMgt (fctrl); -SetFrDs (fctrl); +set_fr_ds (fctrl);ether_addr_copy (pwlanhdr->addr1, StaAddr);ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3,myid (&padapter->eeprompriv));SetDuration (pwlanhdr,0 ); -SetSeqNum (pwlanhdr,0 ); +set_seq_num (pwlanhdr,0 );if (bQoS) {struct ieee80211_qos_hdr *pwlanqoshdr; -SetFrameSubType (pframe,WIFI_QOS_DATA_NULL ); +set_frame_sub_type (pframe,WIFI_QOS_DATA_NULL ); pwlanqoshdr = (struct ieee80211_qos_hdr *)pframe; -SetPriority (&pwlanqoshdr->qos_ctrl,AC ); -SetEOSP (&pwlanqoshdr->qos_ctrl, bEosp); +set_priority (&pwlanqoshdr->qos_ctrl,AC ); +set_eosp (&pwlanqoshdr->qos_ctrl, bEosp); pktlen =sizeof (struct ieee80211_qos_hdr ); }else { -SetFrameSubType (pframe,WIFI_DATA_NULL ); +set_frame_sub_type (pframe,WIFI_DATA_NULL ); pktlen =sizeof (struct ieee80211_hdr_3addr ); }
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +1 -1
@@ -88,7 +88,7 @@ static void Update_ODM_ComInfo_8723b(struct adapter *Adapter)ODM_CmnInfoHook (pDM_Odm,ODM_CMNINFO_RX_UNI , &(dvobj->traffic_stat.rx_bytes));ODM_CmnInfoHook (pDM_Odm,ODM_CMNINFO_WM_MODE , &(pmlmeext->cur_wireless_mode));ODM_CmnInfoHook (pDM_Odm,ODM_CMNINFO_SEC_CHNL_OFFSET , &(pHalData->nCur40MhzPrimeSC)); -ODM_CmnInfoHook (pDM_Odm,ODM_CMNINFO_SEC_MODE , &(Adapter->securitypriv.dot11PrivacyAlgrthm)); +ODM_CmnInfoHook (pDM_Odm,ODM_CMNINFO_SEC_MODE , &(Adapter->securitypriv.dot11_privacy_algrthm));ODM_CmnInfoHook (pDM_Odm,ODM_CMNINFO_BW , &(pHalData->CurrentChannelBW));ODM_CmnInfoHook (pDM_Odm,ODM_CMNINFO_CHNL , &(pHalData->CurrentChannel));ODM_CmnInfoHook (pDM_Odm,ODM_CMNINFO_NET_CLOSED , &(Adapter->net_closed));
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
@@ -1906,7 +1906,7 @@ void rtl8723b_fill_fake_txdesc(/* Encrypt the data frame if under security mode excepct null data. Suggested by CCW. */ /* */ if (bDataFrame) { -u32 EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm; +u32 EncAlg = padapter->securitypriv.dot11_privacy_algrthm;switch (EncAlg) {case _NO_PRIVACY_:
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +1 -1
@@ -112,7 +112,7 @@ static void update_recvframe_phyinfo(union recv_frame *precvframe, pkt_info.is_beacon = pkt_info.bssid_match && - (GetFrameSubType (wlanhdr) ==WIFI_BEACON ); + (get_frame_sub_type (wlanhdr) ==WIFI_BEACON ); sa =get_ta (wlanhdr);
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +3 -3
@@ -202,7 +202,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitprivif ( (check_pending_xmitbuf (pxmitpriv)) && - (padapter->mlmepriv.LinkDetectInfo.bHigherBusyTxTraffic) + (padapter->mlmepriv.link_detect_info.bHigherBusyTxTraffic) ) {if ((phwxmit->accnt >0 ) && (phwxmit->accnt <5 )) { err =-2 ;
@@ -445,7 +445,7 @@ s32 rtl8723bs_mgnt_xmit( pxmitbuf->priv_data =NULL ; -if (GetFrameSubType (pframe) ==WIFI_BEACON ) {/* dump beacon directly */ +if (get_frame_sub_type (pframe) ==WIFI_BEACON ) {/* dump beacon directly */ ret =rtw_write_port (padapter, pdvobjpriv->Queue2Pipe[pxmitbuf->ff_hwaddr], pxmitbuf->len, (u8 *)pxmitbuf);if (ret != _SUCCESS)rtw_sctx_done_err (&pxmitbuf->sctx,RTW_SCTX_DONE_WRITE_PORT_ERR );
@@ -482,7 +482,7 @@ s32 rtl8723bs_hal_xmit( (pxmitframe->attrib.ether_type != 0x888e) && (pxmitframe->attrib.dhcp_pkt != 1) ) { -if (padapter->mlmepriv.LinkDetectInfo.bBusyTraffic) +if (padapter->mlmepriv.link_detect_info.bBusyTraffic)rtw_issue_addbareq_cmd (padapter, pxmitframe); }
drivers/staging/rtl8723bs/include/rtw_mlme.h +8 -8
@@ -44,12 +44,12 @@enum { - dot11AuthAlgrthm_Open =0 , - dot11AuthAlgrthm_Shared, - dot11AuthAlgrthm_8021X, - dot11AuthAlgrthm_Auto, - dot11AuthAlgrthm_WAPI, - dot11AuthAlgrthm_MaxNum + dot11_auth_algrthm_open =0 , + dot11_auth_algrthm_shared, + dot11_auth_algrthm_8021x, + dot11_auth_algrthm_auto, + dot11_auth_algrthm_wapi, + dot11_auth_algrthm_maxnum };/* Scan type including active and passive scan. */
@@ -93,7 +93,7 @@ struct sitesurvey_ctrl { };struct rt_link_detect_t { -u32 NumTxOkInPeriod; +u32 num_tx_ok_in_period;u32 NumRxOkInPeriod;u32 NumRxUnicastOkInPeriod;bool bBusyTraffic;
@@ -171,7 +171,7 @@ struct mlme_priv {struct ht_priv htpriv; -struct rt_link_detect_t LinkDetectInfo; +struct rt_link_detect_t link_detect_info;struct timer_list dynamic_chk_timer;/* dynamic/periodic check timer */ u8 acm_mask;/* for wmm acm mask */
drivers/staging/rtl8723bs/include/rtw_security.h +18 -18
@@ -91,24 +91,24 @@ struct rt_pmkid_list {struct security_priv { -u32 dot11AuthAlgrthm;/* 802.11 auth, could be open, shared, 8021x and authswitch */ -u32 dot11PrivacyAlgrthm;/* This specify the privacy for shared auth. algorithm. */ +u32 dot11_auth_algrthm;/* 802.11 auth, could be open, shared, 8021x and authswitch */ +u32 dot11_privacy_algrthm;/* This specify the privacy for shared auth. algorithm. */ /* WEP */ -u32 dot11PrivacyKeyIndex;/* this is only valid for legendary wep, 0~3 for key id. (tx key index) */ +u32 dot11_privacy_key_index;/* this is only valid for legendary wep, 0~3 for key id. (tx key index) */ union Keytype dot11DefKey[4 ];/* this is only valid for def. key */ u32 dot11DefKeylen[4 ];u8 key_mask;/* use to restore wep key after hal_init */ -u32 dot118021XGrpPrivacy;/* This specify the privacy algthm. used for Grp key */ -u32 dot118021XGrpKeyid;/* key id used for Grp Key (tx key index) */ +u32 dot11_8021x_grp_privacy;/* This specify the privacy algthm. used for Grp key */ +u32 dot11_8021x_grp_key_id;/* key id used for Grp Key (tx key index) */ union Keytype dot118021XGrpKey[BIP_MAX_KEYID +1 ];/* 802.1x Group Key, for inx0 and inx1 */ -union Keytype dot118021XGrptxmickey[BIP_MAX_KEYID +1 ]; +union Keytype dot11_8021x_grp_tx_mickey[BIP_MAX_KEYID +1 ];union Keytype dot118021XGrprxmickey[BIP_MAX_KEYID +1 ];union pn48 dot11Grptxpn;/* PN48 used for Grp Key xmit. */ union pn48 dot11Grprxpn;/* PN48 used for Grp Key recv. */ -u32 dot11wBIPKeyid;/* key id used for BIP Key (tx key index) */ -union Keytype dot11wBIPKey[BIP_MAX_KEYID +1 ];/* BIP Key, for index4 and index5 */ +u32 dot11w_bip_key_id;/* key id used for BIP Key (tx key index) */ +union Keytype dot11w_bip_key[BIP_MAX_KEYID +1 ];/* BIP Key, for index4 and index5 */ union pn48 dot11wBIPtxpn;/* PN48 used for Grp Key xmit. */ union pn48 dot11wBIPrxpn;/* PN48 used for Grp Key recv. */
@@ -127,7 +127,7 @@ struct security_priv {struct arc4_ctx recv_arc4_ctx;u8 binstallGrpkey; -u8 binstallBIPkey; +u8 b_install_bip_key;u8 busetkipkey;/* _timer tkip_timer; */ u8 bcheck_grpkey;
@@ -170,20 +170,20 @@ struct security_priv {#define GET_ENCRY_ALGO (psecuritypriv, psta, encry_algo, bmcst)\ do {\ - switch (psecuritypriv->dot11AuthAlgrthm) {\ - case dot11AuthAlgrthm_Open:\ - case dot11AuthAlgrthm_Shared:\ - case dot11AuthAlgrthm_Auto:\ - encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\ + switch (psecuritypriv->dot11_auth_algrthm) {\ + case dot11_auth_algrthm_open:\ + case dot11_auth_algrthm_shared:\ + case dot11_auth_algrthm_auto:\ + encry_algo = (u8)psecuritypriv->dot11_privacy_algrthm;\ break;\ - case dot11AuthAlgrthm_8021X:\ + case dot11_auth_algrthm_8021x:\ if (bmcst)\ - encry_algo = (u8)psecuritypriv->dot118021XGrpPrivacy;\ + encry_algo = (u8)psecuritypriv->dot11_8021x_grp_privacy;\ else\ encry_algo = (u8)psta->dot118021XPrivacy;\ break;\ - case dot11AuthAlgrthm_WAPI:\ - encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\ + case dot11_auth_algrthm_wapi:\ + encry_algo = (u8)psecuritypriv->dot11_privacy_algrthm;\ break;\ } \ } while (0)
drivers/staging/rtl8723bs/include/rtw_xmit.h +1 -1
@@ -181,7 +181,7 @@ struct pkt_attrib {u8 cts2self;union Keytype dot11tkiptxmickey;/* union Keytype dot11tkiprxmickey; */ -union Keytype dot118021x_UncstKey; +union Keytype dot11_8021x_uncst_key;u8 icmp_pkt;
drivers/staging/rtl8723bs/include/sta_info.h +1 -1
@@ -90,7 +90,7 @@ struct sta_info {uint dot118021XPrivacy;/* aes, tkip... */ union Keytype dot11tkiptxmickey;union Keytype dot11tkiprxmickey; -union Keytype dot118021x_UncstKey; +union Keytype dot11_8021x_uncst_key;union pn48 dot11txpn;/* PN48 used for Unicast xmit */ union pn48 dot11wtxpn;/* PN48 used for Unicast mgmt xmit. */ union pn48 dot11rxpn;/* PN48 used for Unicast recv. */
drivers/staging/rtl8723bs/include/wifi.h +15 -15
@@ -70,29 +70,29 @@ enum {#define _PRIVACY_ BIT(14)#define _ORDER_ BIT(15) -#define SetToDs (pbuf) \ +#define set_to_ds (pbuf) \ (*(__le16 *)(pbuf) |= cpu_to_le16(_TO_DS_))#define GetToDs (pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_TO_DS_)) != 0) -#define SetFrDs (pbuf) \ +#define set_fr_ds (pbuf) \ (*(__le16 *)(pbuf) |= cpu_to_le16(_FROM_DS_))#define GetFrDs (pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_FROM_DS_)) != 0)#define get_tofr_ds (pframe) ((GetToDs(pframe) << 1) | GetFrDs(pframe)) -#define SetMFrag (pbuf) \ +#define set_m_frag (pbuf) \ (*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_FRAG_))#define GetMFrag (pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_MORE_FRAG_)) != 0) -#define ClearMFrag (pbuf) \ +#define clear_m_frag (pbuf) \ (*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_FRAG_)))#define GetRetry (pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_RETRY_)) != 0) -#define ClearRetry (pbuf) \ +#define clear_retry (pbuf) \ (*(__le16 *)(pbuf) &= (~cpu_to_le16(_RETRY_)))#define SetPwrMgt (pbuf) \
@@ -100,18 +100,18 @@ enum {#define GetPwrMgt (pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_PWRMGT_)) != 0) -#define ClearPwrMgt (pbuf) \ +#define clear_pwr_mgt (pbuf) \ (*(__le16 *)(pbuf) &= (~cpu_to_le16(_PWRMGT_))) -#define SetMData (pbuf) \ +#define set_m_data (pbuf) \ (*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_DATA_))#define GetMData (pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_MORE_DATA_)) != 0) -#define ClearMData (pbuf) \ +#define clear_m_data (pbuf) \ (*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_DATA_))) -#define SetPrivacy (pbuf) \ +#define set_privacy (pbuf) \ (*(__le16 *)(pbuf) |= cpu_to_le16(_PRIVACY_))#define GetPrivacy (pbuf) \
@@ -129,10 +129,10 @@ enum { *(unsigned short *)(pbuf) |=cpu_to_le16 (type); \ } while (0) -#define GetFrameSubType (pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(7) |\ +#define get_frame_sub_type (pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(7) |\ BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))) -#define SetFrameSubType (pbuf, type) \ +#define set_frame_sub_type (pbuf, type) \ do { \ *(__le16 *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | \ BIT(5) | BIT(4) | BIT(3) | BIT(2))); \
@@ -153,7 +153,7 @@ enum {cpu_to_le16 (0x0f & (num)); \ } while (0) -#define SetSeqNum (pbuf, num) \ +#define set_seq_num (pbuf, num) \ do { \ *(__le16 *)((size_t)(pbuf) + 22) = \ ((*(__le16 *)((size_t)(pbuf) + 22)) & cpu_to_le16((unsigned short)0x000f)) | \
@@ -164,15 +164,15 @@ enum { (*(__le16 *)((size_t)(pbuf) + 2) = cpu_to_le16(0xffff & (dur))) -#define SetPriority (pbuf, tid) \ +#define set_priority (pbuf, tid) \ (*(__le16 *)(pbuf) |= cpu_to_le16(tid & 0xf))#define GetPriority (pbuf) ((le16_to_cpu(*(__le16 *)(pbuf))) & 0xf) -#define SetEOSP (pbuf, eosp) \ +#define set_eosp (pbuf, eosp) \ (*(__le16 *)(pbuf) |= cpu_to_le16((eosp & 1) << 4)) -#define SetAckpolicy (pbuf, ack) \ +#define set_ack_policy (pbuf, ack) \ (*(__le16 *)(pbuf) |= cpu_to_le16((ack & 3) << 5))#define GetAckpolicy (pbuf) (((le16_to_cpu(*(__le16 *)pbuf)) >> 5) & 0x3)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +88 -88
458 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/os_intfs.c +9 -9
@@ -525,13 +525,13 @@ static void rtw_init_default_value(struct adapter *padapter) psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt; - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ - psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ + psecuritypriv->dot11_privacy_algrthm = _NO_PRIVACY_; - psecuritypriv->dot11PrivacyKeyIndex =0 ; + psecuritypriv->dot11_privacy_key_index =0 ; - psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; - psecuritypriv->dot118021XGrpKeyid =1 ; + psecuritypriv->dot11_8021x_grp_privacy = _NO_PRIVACY_; + psecuritypriv->dot11_8021x_grp_key_id =1 ; psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; psecuritypriv->ndisencryptstatus = Ndis802_11WEPDisabled;
@@ -610,11 +610,11 @@ void rtw_reset_drv_sw(struct adapter *padapter) padapter->xmitpriv.tx_pkts =0 ; padapter->recvpriv.rx_pkts =0 ; - pmlmepriv->LinkDetectInfo.bBusyTraffic = false; + pmlmepriv->link_detect_info.bBusyTraffic = false; -/* pmlmepriv->LinkDetectInfo.TrafficBusyState = false; */ - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =0 ; - pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =0 ; +/* pmlmepriv->link_detect_info.TrafficBusyState = false; */ + pmlmepriv->link_detect_info.TrafficTransitionCount =0 ; + pmlmepriv->link_detect_info.LowPowerTransitionCount =0 ;_clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
Signature · 1 line
2.52.0
PATCH 7/9 staging: rtl8723bs: rename local variables to snake_case
In reply to Khushal ChitturiRename local CamelCase variables in rtw_xmit.c to
follow the kernel naming conventions.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +7 -7
@@ -401,10 +401,10 @@ 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 ; }
@@ -603,17 +603,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 ; }
Signature · 1 line
2.52.0
PATCH 8/9 staging: rtl8723bs: replace N_BYTE_ALIGMENT with PTR_ALIGN
In reply to Khushal ChitturiReplace the custom N_BYTE_ALIGMENT macro with the standard PTR_ALIGN macro in rtw_init_xmit_priv.
This improves unnecessary casting and improves readability without any functional change.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +4 -5
@@ -76,8 +76,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) res = _FAIL; goto exit; } - pxmitpriv->pxmit_frame_buf = (u8 *)N_BYTE_ALIGMENT ((SIZE_PTR )(pxmitpriv->pallocated_frame_buf),4 ); - + pxmitpriv->pxmit_frame_buf =PTR_ALIGN (pxmitpriv->pallocated_frame_buf,4 ); pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;for (i =0 ; i <NR_XMITFRAME ; i++) {
@@ -114,7 +113,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) goto exit; } - pxmitpriv->pxmitbuf = (u8 *)N_BYTE_ALIGMENT ((SIZE_PTR )(pxmitpriv->pallocated_xmitbuf),4 ); + pxmitpriv->pxmitbuf =PTR_ALIGN (pxmitpriv->pallocated_xmitbuf,4 ); pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
@@ -164,7 +163,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) res = _FAIL; goto exit; } - pxmitpriv->xframe_ext = (u8 *)N_BYTE_ALIGMENT ((SIZE_PTR )(pxmitpriv->xframe_ext_alloc_addr),4 ); + pxmitpriv->xframe_ext =PTR_ALIGN (pxmitpriv->xframe_ext_alloc_addr,4 ); pxframe = (struct xmit_frame *)pxmitpriv->xframe_ext;for (i =0 ; i <NR_XMIT_EXTBUFF ; i++) {
@@ -198,7 +197,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) goto exit; } - pxmitpriv->pxmit_extbuf = (u8 *)N_BYTE_ALIGMENT ((SIZE_PTR )(pxmitpriv->pallocated_xmit_extbuf),4 ); + pxmitpriv->pxmit_extbuf =PTR_ALIGN (pxmitpriv->pallocated_xmit_extbuf,4 ); pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;
Signature · 1 line
2.52.0
PATCH 9/9 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 lines exceeding the 100-column limit.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 135 ++++++++++++++-------- 1 file changed, 85 insertions(+), 50 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +85 -50
@@ -125,10 +125,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) {usleep_range (10000 ,11000 ); - 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; }
@@ -141,8 +143,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->flags =XMIT_VO_QUEUE ; -list_add_tail (&pxmitbuf->list, - &pxmitpriv->free_xmitbuf_queue.queue); +list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmitbuf_queue.queue);#ifdef DBG_XMIT_BUF pxmitbuf->no = i;#endif
@@ -208,7 +209,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;
@@ -239,7 +241,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;
@@ -291,7 +295,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++; }
@@ -313,7 +318,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++; }
@@ -323,7 +329,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);
@@ -365,7 +372,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) {
@@ -382,7 +391,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) && +if ((pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_ATHEROS ) && + (pattrib->ampdu_en) && (padapter->securitypriv.dot11_privacy_algrthm == _AES_)) { pattrib->vcs_mode =CTS_TO_SELF ;break ;
@@ -402,8 +412,9 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *if (pattrib->ht_en) {u8 ht_op_mode = pmlmeinfo->HT_protection; -if ((pmlmeext->cur_bwmode && (ht_op_mode ==2 || ht_op_mode ==3 )) || - (!pmlmeext->cur_bwmode && ht_op_mode ==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 ; }
@@ -433,7 +444,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;
@@ -461,7 +473,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;
@@ -469,7 +482,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;
@@ -508,7 +522,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_; }
@@ -560,7 +575,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pmemcpy (pattrib->dot11_8021x_uncst_key.skey, psta->dot11_8021x_uncst_key.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;
@@ -638,7 +653,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 )) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_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 )) {
@@ -652,7 +667,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 ];
@@ -663,7 +680,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 ;
@@ -702,7 +719,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 )) && (!(psta->state & _FW_LINKED))) { + }else if ((check_fwstate (pmlmepriv,WIFI_AP_STATE )) && + (!(psta->state & _FW_LINKED))) { res = _FAIL; goto exit; }
@@ -759,7 +777,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pstatic s32 xmitframe_addmic (struct adapter *padapter,struct xmit_frame *pxmitframe) {signed int curfragnum, length; -u8 *pframe, *payload, mic[8 ]; +u8 *pframe, *payload, mic[8 ], *skey;struct mic_data micdata;struct pkt_attrib *pattrib = &pxmitframe->attrib;struct security_priv *psecuritypriv = &padapter->securitypriv;
@@ -773,15 +791,17 @@ 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 }; + skey = psecuritypriv->dot11_8021x_grp_tx_mickey[ + psecuritypriv->dot11_8021x_grp_key_id].skey; pframe = pxmitframe->buf_addr + hw_hdr_offset;if (bmcst) { -if (!memcmp (psecuritypriv->dot11_8021x_grp_tx_mickey[psecuritypriv->dot11_8021x_grp_key_id].skey, null_key,16 )) +if (!memcmp (skey, null_key,16 ))return _FAIL;/* start to calculate the mic code */ -rtw_secmicsetkey (&micdata, psecuritypriv->dot11_8021x_grp_tx_mickey[psecuritypriv->dot11_8021x_grp_key_id].skey); +rtw_secmicsetkey (&micdata, skey); }else {if (!memcmp (&pattrib->dot11tkiptxmickey.skey[0 ], null_key,16 ))return _FAIL;
@@ -815,11 +835,15 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr 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 ); + length = pattrib->last_txcmdsz - pattrib->hdrlen - + pattrib->iv_len - + ((pattrib->bswenc) ? pattrib->icv_len :0 );rtw_secmicappend (&micdata, 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; }
@@ -990,7 +1014,7 @@ 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->bk_pending.queue)) || (!list_empty (&pxmitpriv->vi_pending.queue)) || (!list_empty (&pxmitpriv->vo_pending.queue))); }
@@ -1022,7 +1046,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;
@@ -1110,7 +1135,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structif (bmcst || (rtw_endofpktfile (&pktfile))) { 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;clear_m_frag (mem_start);
@@ -1141,7 +1167,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;
@@ -1187,7 +1214,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 (get_frame_sub_type (pframe) !=WIFI_DEAUTH &&get_frame_sub_type (pframe) !=WIFI_DISASSOC ) +if ((get_frame_sub_type (pframe) !=WIFI_DEAUTH ) && + (get_frame_sub_type (pframe) !=WIFI_DISASSOC )) goto xmitframe_coalesce_fail; MGMT_body = pframe +sizeof (struct ieee80211_hdr_3addr );
@@ -1226,7 +1254,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
@@ -1240,15 +1268,16 @@ 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 ) -memcpy (pattrib->dot11_8021x_uncst_key.skey, psta->dot11_8021x_uncst_key.skey,16 ); +memcpy (pattrib->dot11_8021x_uncst_key.skey, + psta->dot11_8021x_uncst_key.skey,16 );/* bakeup original management packet */ memcpy (tmp_buf, pframe, pattrib->pktlen);/* move to data portion */
@@ -1271,7 +1300,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 */
@@ -1400,7 +1430,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 ;
@@ -1422,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;
@@ -1757,7 +1787,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 ;
@@ -2011,7 +2042,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 ;
@@ -2106,7 +2138,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;
@@ -2126,7 +2159,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;
@@ -2147,7 +2181,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--;
@@ -2453,7 +2488,7 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey(struct xmit_priv *pxmitpri type =get_frame_sub_type (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.52.0