Skip to content

Commit f84c7db

Browse files
aimannajjarintel-lab-lkp
aimannajjar
authored and
intel-lab-lkp
committed
staging: rtl8712: fix checkpatch warnings
This patch fixes remaining warnings in rtl871x_xmit.c of rtl8712 staging driver The following warnings are resolved: WARNING: line over 80 characters \torvalds#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 \torvalds#79: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:79: + kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4, GFP_ATOMIC); WARNING: line over 80 characters \torvalds#129: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:129: + pxmitbuf->pallocated_buf = kmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ, WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrptxmickey' \torvalds#378: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:378: + psecuritypriv-> + XGrptxmickey[psecuritypriv-> WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' \torvalds#379: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:379: + XGrptxmickey[psecuritypriv-> + XGrpKeyid].skey); WARNING: Avoid multiple line dereference - prefer 'psta->sta_xmitpriv.txseq_tid[pattrib->priority]' \torvalds#544: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:544: + pattrib->seqnum = psta->sta_xmitpriv. + txseq_tid[pattrib->priority]; WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->PrivacyKeyIndex' \torvalds#636: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:636: + (u8)psecuritypriv-> + PrivacyKeyIndex); WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' \torvalds#643: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:643: + (u8)psecuritypriv-> + XGrpKeyid); WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' \torvalds#652: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:652: + (u8)psecuritypriv-> + XGrpKeyid); Signed-off-by: aimannajjar <aiman.najjar@hurranet.com>
1 parent ba22fd4 commit f84c7db

File tree

1 file changed

+41
-44
lines changed

1 file changed

+41
-44
lines changed

‎drivers/staging/rtl8712/rtl871x_xmit.c‎

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,13 @@ int _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
7171
_init_queue(&pxmitpriv->apsd_queue);
7272
_init_queue(&pxmitpriv->free_xmit_queue);
7373
/*
74-
* Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME,
74+
* Please allocate memory with sz = (struct xmit_frame) * NR_XMITFRAME,
7575
* and initialize free_xmit_frame below.
7676
* Please also apply free_txobj to link_up all the xmit_frames...
7777
*/
7878
pxmitpriv->pallocated_frame_buf =
79-
kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4, GFP_ATOMIC);
79+
kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4,
80+
GFP_ATOMIC);
8081
if (!pxmitpriv->pallocated_frame_buf) {
8182
pxmitpriv->pxmit_frame_buf = NULL;
8283
return -ENOMEM;
@@ -126,8 +127,8 @@ int _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
126127
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
127128
for (i = 0; i < NR_XMITBUFF; i++) {
128129
INIT_LIST_HEAD(&pxmitbuf->list);
129-
pxmitbuf->pallocated_buf = kmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ,
130-
GFP_ATOMIC);
130+
pxmitbuf->pallocated_buf =
131+
kmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ, GFP_ATOMIC);
131132
if (!pxmitbuf->pallocated_buf)
132133
return -ENOMEM;
133134
pxmitbuf->pbuf = pxmitbuf->pallocated_buf + XMITBUF_ALIGN_SZ -
@@ -350,7 +351,7 @@ static int xmitframe_addmic(struct _adapter *padapter,
350351
struct sta_info *stainfo;
351352
struct qos_priv *pqospriv = &(padapter->mlmepriv.qospriv);
352353
struct pkt_attrib *pattrib = &pxmitframe->attrib;
353-
struct security_priv *psecuritypriv = &padapter->securitypriv;
354+
struct security_priv *psecpriv = &padapter->securitypriv;
354355
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
355356
u8 priority[4] = {0x0, 0x0, 0x0, 0x0};
356357
bool bmcst = is_multicast_ether_addr(pattrib->ra);
@@ -368,15 +369,14 @@ static int xmitframe_addmic(struct _adapter *padapter,
368369
0x0, 0x0};
369370
pframe = pxmitframe->buf_addr + TXDESC_OFFSET;
370371
if (bmcst) {
371-
if (!memcmp(psecuritypriv->XGrptxmickey
372-
[psecuritypriv->XGrpKeyid].skey,
372+
if (!memcmp(psecpriv->XGrptxmickey
373+
[psecpriv->XGrpKeyid].skey,
373374
null_key, 16))
374375
return -ENOMEM;
375376
/*start to calculate the mic code*/
376377
r8712_secmicsetkey(&micdata,
377-
psecuritypriv->
378-
XGrptxmickey[psecuritypriv->
379-
XGrpKeyid].skey);
378+
psecpriv->XGrptxmickey
379+
[psecpriv->XGrpKeyid].skey);
380380
} else {
381381
if (!memcmp(&stainfo->tkiptxmickey.skey[0],
382382
null_key, 16))
@@ -416,15 +416,15 @@ static int xmitframe_addmic(struct _adapter *padapter,
416416
length = pattrib->last_txcmdsz -
417417
pattrib->hdrlen -
418418
pattrib->iv_len -
419-
((psecuritypriv->sw_encrypt)
419+
((psecpriv->sw_encrypt)
420420
? pattrib->icv_len : 0);
421421
r8712_secmicappend(&micdata, payload,
422422
length);
423423
payload = payload + length;
424424
} else {
425425
length = pxmitpriv->frag_len -
426426
pattrib->hdrlen - pattrib->iv_len -
427-
((psecuritypriv->sw_encrypt) ?
427+
((psecpriv->sw_encrypt) ?
428428
pattrib->icv_len : 0);
429429
r8712_secmicappend(&micdata, payload,
430430
length);
@@ -469,7 +469,7 @@ static sint xmitframe_swencrypt(struct _adapter *padapter,
469469
}
470470

471471
static int make_wlanhdr(struct _adapter *padapter, u8 *hdr,
472-
struct pkt_attrib *pattrib)
472+
struct pkt_attrib *pattr)
473473
{
474474
u16 *qc;
475475

@@ -479,70 +479,70 @@ static int make_wlanhdr(struct _adapter *padapter, u8 *hdr,
479479
__le16 *fctrl = &pwlanhdr->frame_ctl;
480480

481481
memset(hdr, 0, WLANHDR_OFFSET);
482-
SetFrameSubType(fctrl, pattrib->subtype);
483-
if (pattrib->subtype & WIFI_DATA_TYPE) {
482+
SetFrameSubType(fctrl, pattr->subtype);
483+
if (pattr->subtype & WIFI_DATA_TYPE) {
484484
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
485485
/* to_ds = 1, fr_ds = 0; */
486486
SetToDs(fctrl);
487487
memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv),
488488
ETH_ALEN);
489-
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
490-
memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
489+
memcpy(pwlanhdr->addr2, pattr->src, ETH_ALEN);
490+
memcpy(pwlanhdr->addr3, pattr->dst, ETH_ALEN);
491491
} else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
492492
/* to_ds = 0, fr_ds = 1; */
493493
SetFrDs(fctrl);
494-
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
494+
memcpy(pwlanhdr->addr1, pattr->dst, ETH_ALEN);
495495
memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv),
496496
ETH_ALEN);
497-
memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);
497+
memcpy(pwlanhdr->addr3, pattr->src, ETH_ALEN);
498498
} else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
499499
check_fwstate(pmlmepriv,
500500
WIFI_ADHOC_MASTER_STATE)) {
501-
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
502-
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
501+
memcpy(pwlanhdr->addr1, pattr->dst, ETH_ALEN);
502+
memcpy(pwlanhdr->addr2, pattr->src, ETH_ALEN);
503503
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv),
504504
ETH_ALEN);
505505
} else if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
506-
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
507-
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
506+
memcpy(pwlanhdr->addr1, pattr->dst, ETH_ALEN);
507+
memcpy(pwlanhdr->addr2, pattr->src, ETH_ALEN);
508508
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv),
509509
ETH_ALEN);
510510
} else {
511511
return -EINVAL;
512512
}
513513

514-
if (pattrib->encrypt)
514+
if (pattr->encrypt)
515515
SetPrivacy(fctrl);
516516
if (pqospriv->qos_option) {
517-
qc = (unsigned short *)(hdr + pattrib->hdrlen - 2);
518-
if (pattrib->priority)
519-
SetPriority(qc, pattrib->priority);
520-
SetAckpolicy(qc, pattrib->ack_policy);
517+
qc = (unsigned short *)(hdr + pattr->hdrlen - 2);
518+
if (pattr->priority)
519+
SetPriority(qc, pattr->priority);
520+
SetAckpolicy(qc, pattr->ack_policy);
521521
}
522522
/* TODO: fill HT Control Field */
523523
/* Update Seq Num will be handled by f/w */
524524
{
525525
struct sta_info *psta;
526-
bool bmcst = is_multicast_ether_addr(pattrib->ra);
526+
bool bmcst = is_multicast_ether_addr(pattr->ra);
527527

528-
if (pattrib->psta) {
529-
psta = pattrib->psta;
528+
if (pattr->psta) {
529+
psta = pattr->psta;
530530
} else {
531531
if (bmcst)
532532
psta = r8712_get_bcmc_stainfo(padapter);
533533
else
534534
psta =
535535
r8712_get_stainfo(&padapter->stapriv,
536-
pattrib->ra);
536+
pattr->ra);
537537
}
538538
if (psta) {
539539
psta->sta_xmitpriv.txseq_tid
540-
[pattrib->priority]++;
541-
psta->sta_xmitpriv.txseq_tid[pattrib->priority]
540+
[pattr->priority]++;
541+
psta->sta_xmitpriv.txseq_tid[pattr->priority]
542542
&= 0xFFF;
543-
pattrib->seqnum = psta->sta_xmitpriv.
544-
txseq_tid[pattrib->priority];
545-
SetSeqNum(hdr, pattrib->seqnum);
543+
pattr->seqnum =
544+
psta->sta_xmitpriv.txseq_tid[pattr->priority];
545+
SetSeqNum(hdr, pattr->seqnum);
546546
}
547547
}
548548
}
@@ -589,7 +589,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,
589589
addr_t addr;
590590
u8 *pframe, *mem_start, *ptxdesc;
591591
struct sta_info *psta;
592-
struct security_priv *psecuritypriv = &padapter->securitypriv;
592+
struct security_priv *psecpriv = &padapter->securitypriv;
593593
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
594594
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
595595
struct pkt_attrib *pattrib = &pxmitframe->attrib;
@@ -632,24 +632,21 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,
632632
case _WEP40_:
633633
case _WEP104_:
634634
WEP_IV(pattrib->iv, psta->txpn,
635-
(u8)psecuritypriv->
636-
PrivacyKeyIndex);
635+
(u8)psecpriv->PrivacyKeyIndex);
637636
break;
638637
case _TKIP_:
639638
if (bmcst)
640639
TKIP_IV(pattrib->iv,
641640
psta->txpn,
642-
(u8)psecuritypriv->
643-
XGrpKeyid);
641+
(u8)psecpriv->XGrpKeyid);
644642
else
645643
TKIP_IV(pattrib->iv, psta->txpn,
646644
0);
647645
break;
648646
case _AES_:
649647
if (bmcst)
650648
AES_IV(pattrib->iv, psta->txpn,
651-
(u8)psecuritypriv->
652-
XGrpKeyid);
649+
(u8)psecpriv->XGrpKeyid);
653650
else
654651
AES_IV(pattrib->iv, psta->txpn,
655652
0);

0 commit comments

Comments
 (0)