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 09/17] staging:rtl8192u: Refactor union delba_param_set - Style
Date: Tue, 21 Aug 2018 18:15:29 +0100 [thread overview]
Message-ID: <20180821171537.9330-10-johnfwhitmore@gmail.com> (raw)
In-Reply-To: <20180821171537.9330-1-johnfwhitmore@gmail.com>
remove member 'charData' from the union delba_param_set, as it is not
used in code. The remaining member variables have all been renamed to
clear the checkpatch issue with CamelCase naming.
shortData to short_data
Reserved to reserved
Initiator to initiator
TID to tid
These changes are all 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 | 9 ++++-----
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 12 ++++++------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
index 10e81c3c0ff1..008fe722af03 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
@@ -41,12 +41,11 @@ union ba_param_set {
};
union delba_param_set {
- u8 charData[2];
- u16 shortData;
+ u16 short_data;
struct {
- u16 Reserved:11;
- u16 Initiator:1;
- u16 TID:4;
+ u16 reserved:11;
+ u16 initiator:1;
+ u16 tid:4;
} field;
};
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 931123faf9ed..e504d1eb2ccf 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -201,8 +201,8 @@ static struct sk_buff *ieee80211_DELBA(
memset(&DelbaParamSet, 0, 2);
- DelbaParamSet.field.Initiator = (TxRxSelect == TX_DIR) ? 1 : 0;
- DelbaParamSet.field.TID = pBA->BaParamSet.field.tid;
+ DelbaParamSet.field.initiator = (TxRxSelect == TX_DIR) ? 1 : 0;
+ DelbaParamSet.field.tid = pBA->BaParamSet.field.tid;
skb = dev_alloc_skb(len + sizeof(struct rtl_80211_hdr_3addr)); //need to add something others? FIXME
if (!skb) {
@@ -226,7 +226,7 @@ static struct sk_buff *ieee80211_DELBA(
// DELBA Parameter Set
- put_unaligned_le16(DelbaParamSet.shortData, tag);
+ put_unaligned_le16(DelbaParamSet.short_data, tag);
tag += 2;
// Reason Code
@@ -565,14 +565,14 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
dst = &delba->addr2[0];
pDelBaParamSet = (union delba_param_set *)&delba->payload[2];
- if (pDelBaParamSet->field.Initiator == 1) {
+ if (pDelBaParamSet->field.initiator == 1) {
struct rx_ts_record *pRxTs;
if (!GetTs(
ieee,
(struct ts_common_info **)&pRxTs,
dst,
- (u8)pDelBaParamSet->field.TID,
+ (u8)pDelBaParamSet->field.tid,
RX_DIR,
false)) {
IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS for RXTS in %s()\n", __func__);
@@ -587,7 +587,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
ieee,
(struct ts_common_info **)&pTxTs,
dst,
- (u8)pDelBaParamSet->field.TID,
+ (u8)pDelBaParamSet->field.tid,
TX_DIR,
false)) {
IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS for TXTS in %s()\n", __func__);
--
2.18.0
next prev parent reply other threads:[~2018-08-21 17:16 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 ` [PATCH 05/17] staging:rtl8192u: Refactor BA_PARAM_SET " John Whitmore
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 ` John Whitmore [this message]
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-10-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).