From: John Whitmore <johnfwhitmore@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
John Whitmore <johnfwhitmore@gmail.com>
Subject: [PATCH 05/17] staging:rtl8192u: Refactor BA_PARAM_SET - Style
Date: Tue, 21 Aug 2018 18:15:25 +0100 [thread overview]
Message-ID: <20180821171537.9330-6-johnfwhitmore@gmail.com> (raw)
In-Reply-To: <20180821171537.9330-1-johnfwhitmore@gmail.com>
Refactor the union BA_PARAM_SET, firstly removing the 'typedef', this
clears the checkpatch issue with defining new types. Secondly the union
is renamed to lowercase to comply with the coding standard.
These are coding style changes which should have no impact on runtime
code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 6 +++---
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
index 6bbabd9e6562..44f820404347 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
@@ -30,7 +30,7 @@ union sequence_control {
} field;
};
-typedef union _BA_PARAM_SET {
+union ba_param_set {
u8 charData[2];
u16 shortData;
struct {
@@ -39,7 +39,7 @@ typedef union _BA_PARAM_SET {
u16 TID:4;
u16 BufferSize:10;
} field;
-} BA_PARAM_SET, *PBA_PARAM_SET;
+};
typedef union _DELBA_PARAM_SET {
u8 charData[2];
@@ -55,7 +55,7 @@ typedef struct _BA_RECORD {
struct timer_list Timer;
u8 bValid;
u8 DialogToken;
- BA_PARAM_SET BaParamSet;
+ union ba_param_set BaParamSet;
u16 BaTimeoutValue;
union sequence_control BaStartSeqCtrl;
} BA_RECORD, *PBA_RECORD;
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 643fd891f476..469e3e9a0d2e 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -322,7 +322,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
u16 rc = 0;
u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;
PBA_RECORD pBA = NULL;
- PBA_PARAM_SET pBaParamSet = NULL;
+ union ba_param_set *pBaParamSet = NULL;
u16 *pBaTimeoutVal = NULL;
union sequence_control *pBaStartSeqCtrl = NULL;
struct rx_ts_record *pTS = NULL;
@@ -342,7 +342,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
dst = &req->addr2[0];
tag += sizeof(struct rtl_80211_hdr_3addr);
pDialogToken = tag + 2; //category+action
- pBaParamSet = (PBA_PARAM_SET)(tag + 3); //+DialogToken
+ pBaParamSet = (union ba_param_set *)(tag + 3); //+DialogToken
pBaTimeoutVal = (u16 *)(tag + 5);
pBaStartSeqCtrl = (union sequence_control *)(req + 7);
@@ -423,7 +423,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
struct tx_ts_record *pTS = NULL;
u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;
u16 *pStatusCode = NULL, *pBaTimeoutVal = NULL;
- PBA_PARAM_SET pBaParamSet = NULL;
+ union ba_param_set *pBaParamSet = NULL;
u16 ReasonCode;
if (skb->len < sizeof(struct rtl_80211_hdr_3addr) + 9) {
@@ -439,7 +439,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
tag += sizeof(struct rtl_80211_hdr_3addr);
pDialogToken = tag + 2;
pStatusCode = (u16 *)(tag + 3);
- pBaParamSet = (PBA_PARAM_SET)(tag + 5);
+ pBaParamSet = (union ba_param_set *)(tag + 5);
pBaTimeoutVal = (u16 *)(tag + 7);
// Check the capability
--
2.18.0
next prev parent reply other threads:[~2018-08-21 17:15 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 17:15 [PATCH 00/17] staging:rtl8192u: Coding Style changes John Whitmore
2018-08-21 17:15 ` [PATCH 01/17] staging:rtl8192u: Remove unused defines - Style John Whitmore
2018-08-27 17:27 ` Greg KH
2018-08-27 19:21 ` John Whitmore
2018-08-27 19:30 ` Greg KH
2018-08-21 17:15 ` [PATCH 02/17] staging:rtl8192u: Refactor SEQUENCE_CONTROL " John Whitmore
2018-08-21 17:15 ` [PATCH 03/17] staging:rtl8192u: Rename ShortData " John Whitmore
2018-08-21 17:15 ` [PATCH 04/17] staging:rtl8192u: Rename member variables " John Whitmore
2018-08-21 17:15 ` John Whitmore [this message]
2018-08-21 17:15 ` [PATCH 06/17] staging:rtl8192u: Remove charData and rename shortData " John Whitmore
2018-08-21 17:15 ` [PATCH 07/17] staging:rtl8192u: Rename ba_param_set members " John Whitmore
2018-08-21 17:15 ` [PATCH 08/17] staging:rtl8192u: Refactor DELBA_PARAM_SET " John Whitmore
2018-08-21 17:15 ` [PATCH 09/17] staging:rtl8192u: Refactor union delba_param_set " John Whitmore
2018-08-21 17:15 ` [PATCH 10/17] staging:rtl8192u: Refactor struct BA_RECORD " John Whitmore
2018-08-21 17:15 ` [PATCH 11/17] staging:rtl8192u: Rename member variable Timer " John Whitmore
2018-08-21 17:15 ` [PATCH 12/17] staging:rtl8192u: Rename bValid " John Whitmore
2018-08-21 17:15 ` [PATCH 13/17] staging:rtl8192u: Rename DialogToken " John Whitmore
2018-08-21 17:15 ` [PATCH 14/17] staging:rtl8192u: Rename BaParamSet " John Whitmore
2018-08-21 17:15 ` [PATCH 15/17] staging:rtl8192u: Rename BaTimeoutValue " John Whitmore
2018-08-21 17:15 ` [PATCH 16/17] staging:rtl8192u: Rename BaStartSeqCtrl " John Whitmore
2018-08-21 17:15 ` [PATCH 17/17] staging:rtl8192u: Remove commented out code and indent " John Whitmore
2018-08-23 7:44 ` [PATCH 00/17] staging:rtl8192u: Coding Style changes 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=20180821171537.9330-6-johnfwhitmore@gmail.com \
--to=johnfwhitmore@gmail.com \
--cc=devel@driverdev.osuosl.org \
--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).