staging: rtl8712: rtl871x_xmit.{c,h} code style improvements
v3 cover staging: rtl8712: rtl871x_xmit.{c,h} code style improvements
Make several improvements to code style of rtl871x_xmit.c and rtl871x_xmit.h.
v1 -> v2: changes
* Break up single pach into patchset of small patches
v2 -> v3 changes:
* [PATCH 4/5]: Applied suggestions by Joe to improve overall code quality (thanks Joe!)
Aiman Najjar (5):
staging: rtl8712: fix checkpatch long-line warning
staging: rtl8712: fix long-line checkpatch warning
staging: rtl8712: fix checkpatch warnings staging:rtl8712: code improvements to make_wlanhdr
staging: rtl8712:fix multiline derefernce warnings
drivers/staging/rtl8712/rtl871x_xmit.c | 158 ++++++++++++------------- drivers/staging/rtl8712/rtl871x_xmit.h | 2 +- 2 files changed, 77 insertions(+), 83 deletions(-)
Signature · 1 line
2.20.1
PATCH v3 1/5 staging: rtl8712: fix checkpatch long-line warning
This patch fixes these two long-line checkpatch warnings in rtl871x_xmit.c:
WARNING: line over 80 characters
\#74: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:74:
+ * Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME,
WARNING: line over 80 characters
\#79: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:79:
+ kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4, GFP_ATOMIC);
--- drivers/staging/rtl8712/rtl871x_xmit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rtl8712/rtl871x_xmit.c +3 -2
@@ -71,12 +71,13 @@ int _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,_init_queue (&pxmitpriv->apsd_queue);_init_queue (&pxmitpriv->free_xmit_queue);/* -* Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME, +* Please allocate memory with sz = (struct xmit_frame) * NR_XMITFRAME, * and initialize free_xmit_frame below. * Please also apply free_txobj to link_up all the xmit_frames... */ pxmitpriv->pallocated_frame_buf = -kmalloc (NR_XMITFRAME *sizeof (struct xmit_frame ) +4 ,GFP_ATOMIC ); +kmalloc (NR_XMITFRAME *sizeof (struct xmit_frame ) +4 , +GFP_ATOMIC );if (!pxmitpriv->pallocated_frame_buf) { pxmitpriv->pxmit_frame_buf =NULL ;return -ENOMEM ;
Signature · 1 line
2.20.1
PATCH v3 2/5 staging: rtl8712: fix long-line checkpatch warning
In reply to Aiman NajjarThis patch fixes the following warning in rtl871x_xmit.c:
WARNING: line over 80 characters
130: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:130:
+ pxmitbuf->pallocated_buf = kmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ,
--- drivers/staging/rtl8712/rtl871x_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8712/rtl871x_xmit.c +2 -2
@@ -127,8 +127,8 @@ int _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;for (i =0 ; i <NR_XMITBUFF ; i++) {INIT_LIST_HEAD (&pxmitbuf->list); - pxmitbuf->pallocated_buf =kmalloc (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ , -GFP_ATOMIC ); + pxmitbuf->pallocated_buf = +kmalloc (MAX_XMITBUF_SZ +XMITBUF_ALIGN_SZ ,GFP_ATOMIC );if (!pxmitbuf->pallocated_buf)return -ENOMEM ; pxmitbuf->pbuf = pxmitbuf->pallocated_buf + XMITBUF_ALIGN_SZ -
Signature · 1 line
2.20.1
PATCH v3 3/5 staging: rtl8712: fix checkpatch warnings
In reply to Aiman NajjarThis patch fixes multiline dereference warnings in rtl871x_xmit.c:
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrptxmickey' 379: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:379:
+ psecuritypriv->
+ XGrptxmickey[psecuritypriv->
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' 380: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:380:
+ XGrptxmickey[psecuritypriv->
+ XGrpKeyid].skey);
--- drivers/staging/rtl8712/rtl871x_xmit.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/staging/rtl8712/rtl871x_xmit.c +7 -8
@@ -351,7 +351,7 @@ static int xmitframe_addmic(struct _adapter *padapter,struct sta_info *stainfo;struct qos_priv *pqospriv = &(padapter->mlmepriv.qospriv);struct pkt_attrib *pattrib = &pxmitframe->attrib; -struct security_priv *psecuritypriv = &padapter->securitypriv; +struct security_priv *psecpriv = &padapter->securitypriv;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;u8 priority[4 ] = {0x0 ,0x0 ,0x0 ,0x0 };bool bmcst =is_multicast_ether_addr (pattrib->ra);
@@ -369,15 +369,14 @@ static int xmitframe_addmic(struct _adapter *padapter, 0x0, 0x0}; pframe = pxmitframe->buf_addr +TXDESC_OFFSET ;if (bmcst) { -if (!memcmp (psecuritypriv->XGrptxmickey - [psecuritypriv->XGrpKeyid].skey, +if (!memcmp (psecpriv->XGrptxmickey + [psecpriv->XGrpKeyid].skey, null_key,16 ))return -ENOMEM ;/*start to calculate the mic code*/ r8712_secmicsetkey (&micdata, - psecuritypriv-> - XGrptxmickey[psecuritypriv-> - XGrpKeyid].skey); + psecpriv->XGrptxmickey + [psecpriv->XGrpKeyid].skey); }else {if (!memcmp (&stainfo->tkiptxmickey.skey[0 ], null_key,16 ))
@@ -417,7 +416,7 @@ static int xmitframe_addmic(struct _adapter *padapter, length = pattrib->last_txcmdsz - pattrib->hdrlen - pattrib->iv_len - - ((psecuritypriv->sw_encrypt) + ((psecpriv->sw_encrypt) ? pattrib->icv_len :0 );r8712_secmicappend (&micdata, payload, length);
@@ -425,7 +424,7 @@ static int xmitframe_addmic(struct _adapter *padapter, }else { length = pxmitpriv->frag_len - pattrib->hdrlen - pattrib->iv_len - - ((psecuritypriv->sw_encrypt) ? + ((psecpriv->sw_encrypt) ? pattrib->icv_len :0 );r8712_secmicappend (&micdata, payload, length);
Signature · 1 line
2.20.1
PATCH v3 4/5 staging:rtl8712: code improvements to make_wlanhdr
In reply to Aiman Najjar1. Refactor make_wlanhdr to improve code style.
2. Use ether_addr_copy instead of memcpy to copy addresses.
--- drivers/staging/rtl8712/rtl871x_xmit.c | 123 ++++++++++++------------- drivers/staging/rtl8712/rtl871x_xmit.h | 2 +- 2 files changed, 61 insertions(+), 64 deletions(-)
drivers/staging/rtl8712/rtl871x_xmit.c +60 -63
@@ -477,75 +477,72 @@ static int make_wlanhdr(struct _adapter *padapter, u8 *hdr,struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct qos_priv *pqospriv = &pmlmepriv->qospriv;__le16 *fctrl = &pwlanhdr->frame_ctl; +u8 *bssid;memset (hdr,0 ,WLANHDR_OFFSET );SetFrameSubType (fctrl, pattrib->subtype); -if (pattrib->subtype &WIFI_DATA_TYPE ) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { -/* to_ds = 1, fr_ds = 0; */ -SetToDs (fctrl); -memcpy (pwlanhdr->addr1,get_bssid (pmlmepriv), -ETH_ALEN ); -memcpy (pwlanhdr->addr2, pattrib->src,ETH_ALEN ); -memcpy (pwlanhdr->addr3, pattrib->dst,ETH_ALEN ); - }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) { -/* to_ds = 0, fr_ds = 1; */ -SetFrDs (fctrl); -memcpy (pwlanhdr->addr1, pattrib->dst,ETH_ALEN ); -memcpy (pwlanhdr->addr2,get_bssid (pmlmepriv), -ETH_ALEN ); -memcpy (pwlanhdr->addr3, pattrib->src,ETH_ALEN ); - }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 ); - }else if (check_fwstate (pmlmepriv,WIFI_MP_STATE )) { -memcpy (pwlanhdr->addr1, pattrib->dst,ETH_ALEN ); -memcpy (pwlanhdr->addr2, pattrib->src,ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_bssid (pmlmepriv), -ETH_ALEN ); - }else { -return -EINVAL ; - } +if (!(pattrib->subtype &WIFI_DATA_TYPE )) +return 0 ; -if (pattrib->encrypt) -SetPrivacy (fctrl); -if (pqospriv->qos_option) { - qc = (unsigned short *)(hdr + pattrib->hdrlen -2 ); -if (pattrib->priority) -SetPriority (qc, pattrib->priority); -SetAckpolicy (qc, pattrib->ack_policy); - } -/* TODO: fill HT Control Field */ -/* Update Seq Num will be handled by f/w */ - { -struct sta_info *psta; -bool bmcst =is_multicast_ether_addr (pattrib->ra); - -if (pattrib->psta) { - psta = pattrib->psta; - }else { -if (bmcst) - psta =r8712_get_bcmc_stainfo (padapter); -else - psta = -r8712_get_stainfo (&padapter->stapriv, - pattrib->ra); - } -if (psta) { - psta->sta_xmitpriv.txseq_tid - [pattrib->priority]++; - psta->sta_xmitpriv.txseq_tid[pattrib->priority] - &=0xFFF ; - pattrib->seqnum = psta->sta_xmitpriv. - txseq_tid[pattrib->priority]; -SetSeqNum (hdr, pattrib->seqnum); - } + bssid =get_bssid (pmlmepriv); + +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { +/* to_ds = 1, fr_ds = 0; */ +SetToDs (fctrl); +ether_addr_copy (pwlanhdr->addr1, bssid); +ether_addr_copy (pwlanhdr->addr2, pattrib->src); +ether_addr_copy (pwlanhdr->addr3, pattrib->dst); + }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) { +/* to_ds = 0, fr_ds = 1; */ +SetFrDs (fctrl); +ether_addr_copy (pwlanhdr->addr1, pattrib->dst); +ether_addr_copy (pwlanhdr->addr2, bssid); +ether_addr_copy (pwlanhdr->addr3, pattrib->src); + }else if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { +ether_addr_copy (pwlanhdr->addr1, pattrib->dst); +ether_addr_copy (pwlanhdr->addr2, pattrib->src); +ether_addr_copy (pwlanhdr->addr3, bssid); + }else if (check_fwstate (pmlmepriv,WIFI_MP_STATE )) { +ether_addr_copy (pwlanhdr->addr1, pattrib->dst); +ether_addr_copy (pwlanhdr->addr2, pattrib->src); +ether_addr_copy (pwlanhdr->addr3, bssid); + }else { +return -EINVAL ; + } + +if (pattrib->encrypt) +SetPrivacy (fctrl); +if (pqospriv->qos_option) { + qc = (unsigned short *)(hdr + pattrib->hdrlen -2 ); +if (pattrib->priority) +SetPriority (qc, pattrib->priority); +SetAckpolicy (qc, pattrib->ack_policy); + } +/* TODO: fill HT Control Field */ +/* Update Seq Num will be handled by f/w */ + { +struct sta_info *psta; +bool bmcst =is_multicast_ether_addr (pattrib->ra); + +if (pattrib->psta) + psta = pattrib->psta; +else if (bmcst) + psta =r8712_get_bcmc_stainfo (padapter); +else + psta =r8712_get_stainfo (&padapter->stapriv, + pattrib->ra); + +if (psta) { +u16 *txtid = psta->sta_xmitpriv.txseq_tid; + + txtid[pattrib->priority]++; + txtid[pattrib->priority] &=0xFFF ; + pattrib->seqnum = txtid[pattrib->priority]; +SetSeqNum (hdr, pattrib->seqnum); } } +return 0 ; }
drivers/staging/rtl8712/rtl871x_xmit.h +1 -1
@@ -115,7 +115,7 @@ struct pkt_attrib {u8 icv_len;unsigned char iv[8 ];unsigned char icv[8 ]; -u8 dst[ETH_ALEN ]; +u8 dst[ETH_ALEN ]__aligned(2) ;/* for ether_addr_copy */ u8 src[ETH_ALEN ];u8 ta[ETH_ALEN ];u8 ra[ETH_ALEN ];
Signature · 1 line
2.20.1
PATCH v3 5/5 staging: rtl8712:fix multiline derefernce warnings
In reply to Aiman NajjarThis patch fixes remaining checkpatch warnings
in rtl871x_xmit.c:
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->PrivacyKeyIndex' 636: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:636:
+ (u8)psecuritypriv->
+ PrivacyKeyIndex);
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' 643: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:643:
+ (u8)psecuritypriv->
+ XGrpKeyid);
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' 652: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:652:
+ (u8)psecuritypriv->
+ XGrpKeyid);
--- drivers/staging/rtl8712/rtl871x_xmit.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/staging/rtl8712/rtl871x_xmit.c +4 -7
@@ -586,7 +586,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,addr_t addr;u8 *pframe, *mem_start, *ptxdesc;struct sta_info *psta; -struct security_priv *psecuritypriv = &padapter->securitypriv; +struct security_priv *psecpriv = &padapter->securitypriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct pkt_attrib *pattrib = &pxmitframe->attrib;
@@ -629,15 +629,13 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,case _WEP40_:case _WEP104_:WEP_IV (pattrib->iv, psta->txpn, - (u8 )psecuritypriv-> - PrivacyKeyIndex); + (u8 )psecpriv->PrivacyKeyIndex);break ;case _TKIP_:if (bmcst)TKIP_IV (pattrib->iv, psta->txpn, - (u8 )psecuritypriv-> - XGrpKeyid); + (u8 )psecpriv->XGrpKeyid);else TKIP_IV (pattrib->iv, psta->txpn,0 );
@@ -645,8 +643,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,case _AES_:if (bmcst)AES_IV (pattrib->iv, psta->txpn, - (u8 )psecuritypriv-> - XGrpKeyid); + (u8 )psecpriv->XGrpKeyid);else AES_IV (pattrib->iv, psta->txpn,0 );
Signature · 1 line
2.20.1
Re: [PATCH v3 0/5] staging: rtl8712: rtl871x_xmit.{c, h} code style improvements
In reply to Aiman NajjarRe: [PATCH v3 0/5] staging: rtl8712: rtl871x_xmit.{c, h} code style improvements
Thanks Dan for your review!!
Quoted 7 lines · Dan Carpenter
Looks good. Thanks!
Reviewed-by Dan Carpenter <[email protected]>regards,
dan carpenter