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 15/21] staging:rtl8192u: Rename MaxRxAMPDUFactor - Style
Date: Wed, 29 Aug 2018 21:35:41 +0100 [thread overview]
Message-ID: <20180829203547.15650-16-johnfwhitmore@gmail.com> (raw)
In-Reply-To: <20180829203547.15650-1-johnfwhitmore@gmail.com>
Rename the bitfield member 'MaxRxAMPDUFactor' to
'max_rx_ampdu_factor', this clears the checkpatch issue with CamelCase
naming.
The change is a coding style change which should not impact runtime
code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 2 +-
.../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
index 040660a46bca..12db4ac9703b 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
@@ -55,7 +55,7 @@ struct ht_capability_ele {
u8 not_used_l_sig_txop_protect:1;
//MAC HT parameters info
- u8 MaxRxAMPDUFactor:2;
+ u8 max_rx_ampdu_factor:2;
u8 MPDUDensity:3;
u8 Rsvd2:3;
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index ec96e14a2bed..4fc919ebd10b 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
@@ -147,7 +147,7 @@ void HTDebugHTCapability(u8 *CapIE, u8 *TitleString)
IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSupport Short GI for 40M = %s\n", (pCapELE->short_gi40_mhz) ? "YES" : "NO");
IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMax AMSDU Size = %s\n", (pCapELE->max_amsdu_size) ? "3839" : "7935");
IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSupport CCK in 20/40 mode = %s\n", (pCapELE->dss_cck) ? "YES" : "NO");
- IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMax AMPDU Factor = %d\n", pCapELE->MaxRxAMPDUFactor);
+ IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMax AMPDU Factor = %d\n", pCapELE->max_rx_ampdu_factor);
IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMPDU Density = %d\n", pCapELE->MPDUDensity);
IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMCS Rate Set = [%x][%x][%x][%x][%x]\n", pCapELE->MCS[0],\
pCapELE->MCS[1], pCapELE->MCS[2], pCapELE->MCS[3], pCapELE->MCS[4]);
@@ -571,9 +571,9 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u
if (IsEncrypt) {
pCapELE->MPDUDensity = 7; // 8us
- pCapELE->MaxRxAMPDUFactor = 2; // 2 is for 32 K and 3 is 64K
+ pCapELE->max_rx_ampdu_factor = 2; // 2 is for 32 K and 3 is 64K
} else {
- pCapELE->MaxRxAMPDUFactor = 3; // 2 is for 32 K and 3 is 64K
+ pCapELE->max_rx_ampdu_factor = 3; // 2 is for 32 K and 3 is 64K
pCapELE->MPDUDensity = 0; // no density
}
@@ -978,8 +978,8 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
*/
if (!pHTInfo->bRegRT2RTAggregation) {
// Decide AMPDU Factor according to protocol handshake
- if (pHTInfo->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor)
- pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor;
+ if (pHTInfo->AMPDU_Factor > pPeerHTCap->max_rx_ampdu_factor)
+ pHTInfo->CurrentAMPDUFactor = pPeerHTCap->max_rx_ampdu_factor;
else
pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor;
} else {
@@ -990,12 +990,12 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
if (ieee->current_network.bssht.bdRT2RTAggregation) {
if (ieee->pairwise_key_type != KEY_TYPE_NA)
// Realtek may set 32k in security mode and 64k for others
- pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor;
+ pHTInfo->CurrentAMPDUFactor = pPeerHTCap->max_rx_ampdu_factor;
else
pHTInfo->CurrentAMPDUFactor = HT_AGG_SIZE_64K;
} else {
- if (pPeerHTCap->MaxRxAMPDUFactor < HT_AGG_SIZE_32K)
- pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor;
+ if (pPeerHTCap->max_rx_ampdu_factor < HT_AGG_SIZE_32K)
+ pHTInfo->CurrentAMPDUFactor = pPeerHTCap->max_rx_ampdu_factor;
else
pHTInfo->CurrentAMPDUFactor = HT_AGG_SIZE_32K;
}
--
2.18.0
next prev parent reply other threads:[~2018-08-29 20:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-29 20:35 [PATCH 00/21] staging:rtl8192u: Refactor ht_capability_ele " John Whitmore
2018-08-29 20:35 ` [PATCH 01/21] staging:rtl8192u: Rename AdvCoding " John Whitmore
2018-08-29 21:14 ` Joe Perches
2018-08-29 21:21 ` Larry Finger
2018-08-29 21:55 ` John Whitmore
2018-08-30 22:34 ` Joe Perches
2018-08-31 22:27 ` John Whitmore
2018-08-30 8:23 ` Dan Carpenter
2018-08-30 8:26 ` Dan Carpenter
2018-08-30 21:35 ` John Whitmore
2018-08-31 7:24 ` Dan Carpenter
2018-09-10 15:08 ` Greg KH
2018-08-29 20:35 ` [PATCH 02/21] staging:rtl8192u: Rename ChlWidth " John Whitmore
2018-08-29 20:35 ` [PATCH 03/21] staging:rtl8192u: Rename MimoPwrSave " John Whitmore
2018-08-29 20:35 ` [PATCH 04/21] staging:rtl8192u: Rename GreenField " John Whitmore
2018-08-29 20:35 ` [PATCH 05/21] staging:rtl8192u: Rename ShortGI20Mhz " John Whitmore
2018-08-29 20:35 ` [PATCH 06/21] staging:rtl8192u: Rename ShortGI40Mhz " John Whitmore
2018-08-29 20:35 ` [PATCH 07/21] staging:rtl8192u: Rename TxSTBC " John Whitmore
2018-08-29 20:35 ` [PATCH 08/21] staging:rtl8192u: Rename RxSTBC " John Whitmore
2018-08-29 20:35 ` [PATCH 09/21] staging:rtl8192u: Rename DelayBA " John Whitmore
2018-08-29 20:35 ` [PATCH 10/21] staging:rtl8192u: Rename MaxAMSDUSize " John Whitmore
2018-08-29 20:35 ` [PATCH 11/21] staging:rtl8192u: Rename DssCCk " John Whitmore
2018-08-29 20:35 ` [PATCH 12/21] staging:rtl8192u: Rename PSMP " John Whitmore
2018-08-29 20:35 ` [PATCH 13/21] staging:rtl8192u: Rename Rsvd1 " John Whitmore
2018-08-29 20:35 ` [PATCH 14/21] staging:rtl8192u: Rename LSigTxopProtect " John Whitmore
2018-08-29 20:35 ` John Whitmore [this message]
2018-08-29 20:35 ` [PATCH 16/21] staging:rtl8192u: Rename MPDUDensity " John Whitmore
2018-08-29 20:35 ` [PATCH 17/21] staging:rtl8192u: Rename Rsvd2 " John Whitmore
2018-08-29 20:35 ` [PATCH 18/21] staging:rtl8192u: Rename MCS " John Whitmore
2018-08-29 20:35 ` [PATCH 19/21] staging:rtl8192u: Rename ExtHTCapInfo " John Whitmore
2018-08-29 20:35 ` [PATCH 20/21] staging:rtl8192u: Rename TxBFCap " John Whitmore
2018-08-29 20:35 ` [PATCH 21/21] staging:rtl8192u: Rename ASCap " John Whitmore
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=20180829203547.15650-16-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
Powered by JetHome