From: aimannajjar <aiman.najjar@hurranet.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: aimannajjar <aiman.najjar@hurranet.com>,
Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 4/5] staging: rtl8712: fix multiline derefernce warning
Date: Fri, 27 Mar 2020 20:08:10 -0400 [thread overview]
Message-ID: <beb6c8c826cdda751f29f985f2b5dedfd2f87914.1585353747.git.aiman.najjar@hurranet.com> (raw)
In-Reply-To: <cover.1585353747.git.aiman.najjar@hurranet.com>
This patch fixes the following checkpatch warning in
rtl8712x_xmit.c:
WARNING: Avoid multiple line dereference - prefer 'psta->sta_xmitpriv.txseq_tid[pattrib->priority]'
544: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:544:
+ pattrib->seqnum = psta->sta_xmitpriv.
+ txseq_tid[pattrib->priority];
Signed-off-by: aimannajjar <aiman.najjar@hurranet.com>
---
drivers/staging/rtl8712/rtl871x_xmit.c | 50 +++++++++++++-------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
index 0f789c821552..04da7b318340 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -469,7 +469,7 @@ static sint xmitframe_swencrypt(struct _adapter *padapter,
}
static int make_wlanhdr(struct _adapter *padapter, u8 *hdr,
- struct pkt_attrib *pattrib)
+ struct pkt_attrib *pattr)
{
u16 *qc;
@@ -479,70 +479,70 @@ static int make_wlanhdr(struct _adapter *padapter, u8 *hdr,
__le16 *fctrl = &pwlanhdr->frame_ctl;
memset(hdr, 0, WLANHDR_OFFSET);
- SetFrameSubType(fctrl, pattrib->subtype);
- if (pattrib->subtype & WIFI_DATA_TYPE) {
+ SetFrameSubType(fctrl, pattr->subtype);
+ if (pattr->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);
+ memcpy(pwlanhdr->addr2, pattr->src, ETH_ALEN);
+ memcpy(pwlanhdr->addr3, pattr->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->addr1, pattr->dst, ETH_ALEN);
memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv),
ETH_ALEN);
- memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);
+ memcpy(pwlanhdr->addr3, pattr->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->addr1, pattr->dst, ETH_ALEN);
+ memcpy(pwlanhdr->addr2, pattr->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->addr1, pattr->dst, ETH_ALEN);
+ memcpy(pwlanhdr->addr2, pattr->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv),
ETH_ALEN);
} else {
return -EINVAL;
}
- if (pattrib->encrypt)
+ if (pattr->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);
+ qc = (unsigned short *)(hdr + pattr->hdrlen - 2);
+ if (pattr->priority)
+ SetPriority(qc, pattr->priority);
+ SetAckpolicy(qc, pattr->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);
+ bool bmcst = is_multicast_ether_addr(pattr->ra);
- if (pattrib->psta) {
- psta = pattrib->psta;
+ if (pattr->psta) {
+ psta = pattr->psta;
} else {
if (bmcst)
psta = r8712_get_bcmc_stainfo(padapter);
else
psta =
r8712_get_stainfo(&padapter->stapriv,
- pattrib->ra);
+ pattr->ra);
}
if (psta) {
psta->sta_xmitpriv.txseq_tid
- [pattrib->priority]++;
- psta->sta_xmitpriv.txseq_tid[pattrib->priority]
+ [pattr->priority]++;
+ psta->sta_xmitpriv.txseq_tid[pattr->priority]
&= 0xFFF;
- pattrib->seqnum = psta->sta_xmitpriv.
- txseq_tid[pattrib->priority];
- SetSeqNum(hdr, pattrib->seqnum);
+ pattr->seqnum =
+ psta->sta_xmitpriv.txseq_tid[pattr->priority];
+ SetSeqNum(hdr, pattr->seqnum);
}
}
}
--
2.20.1
next prev parent reply other threads:[~2020-03-28 16:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 5:56 [PATCH] staging: rtl8712: fix checkpatch warnings Aiman Najjar
2020-03-27 8:04 ` Greg Kroah-Hartman
2020-03-28 0:08 ` [PATCH v2 0/5] staging: rtl8712: fix rtl871x_xmit.c warnings aimannajjar
2020-03-28 0:08 ` [PATCH v2 1/5] staging: rtl8712: fix checkpatch long-line warning aimannajjar
2020-04-02 8:17 ` Dan Carpenter
2020-04-02 8:19 ` Dan Carpenter
2020-03-28 0:08 ` [PATCH v2 2/5] staging: rtl8712: fix long-line checkpatch warning aimannajjar
2020-03-28 0:08 ` [PATCH v2 3/5] staging: rtl8712: fix checkpatch warnings aimannajjar
2020-03-28 0:08 ` aimannajjar [this message]
2020-03-28 19:17 ` [PATCH v2 4/5] staging: rtl8712: fix multiline derefernce warning Joe Perches
2020-03-28 19:30 ` Aiman Najjar
2020-04-02 8:16 ` Dan Carpenter
2020-03-28 0:08 ` [PATCH v2 5/5] staging: rtl8712:fix multiline derefernce warnings aimannajjar
2020-04-02 8:12 ` [PATCH] staging: rtl8712: fix checkpatch warnings Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=beb6c8c826cdda751f29f985f2b5dedfd2f87914.1585353747.git.aiman.najjar@hurranet.com \
--to=aiman.najjar@hurranet.com \
--cc=Larry.Finger@lwfinger.net \
--cc=devel@driverdev.osuosl.org \
--cc=florian.c.schilhabel@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).