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 13/17] staging:rtl8192u: Rename DialogToken - Style
Date: Tue, 21 Aug 2018 18:15:33 +0100 [thread overview]
Message-ID: <20180821171537.9330-14-johnfwhitmore@gmail.com> (raw)
In-Reply-To: <20180821171537.9330-1-johnfwhitmore@gmail.com>
Rename the member variable DialogToken to dialog_token. This clears
the checkpatch issue with CamelCase naming.
This is a coding style change which should have no impact on runtime
code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 2 +-
.../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
index 9ec381c049aa..948888224f24 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
@@ -52,7 +52,7 @@ union delba_param_set {
struct ba_record {
struct timer_list timer;
u8 valid;
- u8 DialogToken;
+ u8 dialog_token;
union ba_param_set BaParamSet;
u16 BaTimeoutValue;
union sequence_control BaStartSeqCtrl;
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index feac3cb371cd..21398892b0e5 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -92,7 +92,7 @@ void ResetBaEntry(struct ba_record *pBA)
pBA->valid = false;
pBA->BaParamSet.short_data = 0;
pBA->BaTimeoutValue = 0;
- pBA->DialogToken = 0;
+ pBA->dialog_token = 0;
pBA->BaStartSeqCtrl.short_data = 0;
}
//These functions need porting here or not?
@@ -140,7 +140,7 @@ static struct sk_buff *ieee80211_ADDBA(struct ieee80211_device *ieee, u8 *Dst, s
*tag++ = ACT_CAT_BA;
*tag++ = type;
// Dialog Token
- *tag++ = pBA->DialogToken;
+ *tag++ = pBA->dialog_token;
if (ACT_ADDBARSP == type) {
// Status Code
@@ -382,7 +382,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
// Admit the ADDBA Request
//
DeActivateBAEntry(ieee, pBA);
- pBA->DialogToken = *pDialogToken;
+ pBA->dialog_token = *pDialogToken;
pBA->BaParamSet = *pBaParamSet;
pBA->BaTimeoutValue = *pBaTimeoutVal;
pBA->BaStartSeqCtrl = *pBaStartSeqCtrl;
@@ -402,7 +402,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
struct ba_record BA;
BA.BaParamSet = *pBaParamSet;
BA.BaTimeoutValue = *pBaTimeoutVal;
- BA.DialogToken = *pDialogToken;
+ BA.dialog_token = *pDialogToken;
BA.BaParamSet.field.ba_policy = BA_POLICY_IMMEDIATE;
ieee80211_send_ADDBARsp(ieee, dst, &BA, rc);
return 0; //we send RSP out.
@@ -482,7 +482,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
// Since BA is already setup, we ignore all other ADDBA Response.
IEEE80211_DEBUG(IEEE80211_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp. Drop because already admit it! \n");
return -1;
- } else if ((!pPendingBA->valid) || (*pDialogToken != pPendingBA->DialogToken)) {
+ } else if ((!pPendingBA->valid) || (*pDialogToken != pPendingBA->dialog_token)) {
IEEE80211_DEBUG(IEEE80211_DL_ERR, "OnADDBARsp(): Recv ADDBA Rsp. BA invalid, DELBA! \n");
ReasonCode = DELBA_REASON_UNKNOWN_BA;
goto OnADDBARsp_Reject;
@@ -510,7 +510,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
//
// Admitted condition
//
- pAdmittedBA->DialogToken = *pDialogToken;
+ pAdmittedBA->dialog_token = *pDialogToken;
pAdmittedBA->BaTimeoutValue = *pBaTimeoutVal;
pAdmittedBA->BaStartSeqCtrl = pPendingBA->BaStartSeqCtrl;
pAdmittedBA->BaParamSet = *pBaParamSet;
@@ -623,7 +623,7 @@ TsInitAddBA(
// Set parameters to "Pending" variable set
DeActivateBAEntry(ieee, pBA);
- pBA->DialogToken++; // DialogToken: Only keep the latest dialog token
+ pBA->dialog_token++; // DialogToken: Only keep the latest dialog token
pBA->BaParamSet.field.amsdu_support = 0; // Do not support A-MSDU with A-MPDU now!!
pBA->BaParamSet.field.ba_policy = Policy; // Policy: Delayed or Immediate
pBA->BaParamSet.field.tid = pTS->ts_common_info.t_spec.ts_info.uc_tsid; // TID
--
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 ` [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 ` John Whitmore [this message]
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-14-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).