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 18/21] staging:rtl8192u: Rename MCS - Style
Date: Wed, 29 Aug 2018 21:35:44 +0100 [thread overview]
Message-ID: <20180829203547.15650-19-johnfwhitmore@gmail.com> (raw)
In-Reply-To: <20180829203547.15650-1-johnfwhitmore@gmail.com>
Rename the member 'MCS' to 'cap_mcs', since the uppercase name
conflicts with the coding standard. The 'cap' has been prepended
to make the variable easier to find in the code.
This is a coding style change which should have no impact on runtime
code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
.../staging/rtl8192u/ieee80211/ieee80211_wx.c | 2 +-
.../staging/rtl8192u/ieee80211/rtl819x_HT.h | 2 +-
.../rtl8192u/ieee80211/rtl819x_HTProc.c | 20 +++++++++----------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
index a6fe975902bb..a96cc5c01b10 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
@@ -159,7 +159,7 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,
((ht_cap->short_gi40_mhz)?1:0):
((ht_cap->short_gi20_mhz)?1:0);
- max_mcs = HTGetHighestMCSRate(ieee, ht_cap->MCS, MCS_FILTER_ALL);
+ max_mcs = HTGetHighestMCSRate(ieee, ht_cap->cap_mcs, MCS_FILTER_ALL);
rate = MCS_DATA_RATE[is40M][isShortGI][max_mcs&0x7f];
if (rate > max_rate)
max_rate = rate;
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
index 2b73279b45d8..edd0c00307bf 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
@@ -60,7 +60,7 @@ struct ht_capability_ele {
u8 not_used_rsvd2:3;
//Supported MCS set
- u8 MCS[16];
+ u8 cap_mcs[16];
//Extended HT Capability Info
u16 ExtHTCapInfo;
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index 19c4903b572f..625d117e5a8f 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
@@ -149,8 +149,8 @@ void HTDebugHTCapability(u8 *CapIE, u8 *TitleString)
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->max_rx_ampdu_factor);
IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMPDU Density = %d\n", pCapELE->mpdu_density);
- 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]);
+ IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMCS Rate Set = [%x][%x][%x][%x][%x]\n", pCapELE->cap_mcs[0],\
+ pCapELE->cap_mcs[1], pCapELE->cap_mcs[2], pCapELE->cap_mcs[3], pCapELE->cap_mcs[4]);
}
/*
@@ -578,15 +578,15 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u
}
//Supported MCS set
- memcpy(pCapELE->MCS, ieee->Regdot11HTOperationalRateSet, 16);
+ memcpy(pCapELE->cap_mcs, ieee->Regdot11HTOperationalRateSet, 16);
if (pHT->IOTAction & HT_IOT_ACT_DISABLE_MCS15)
- pCapELE->MCS[1] &= 0x7f;
+ pCapELE->cap_mcs[1] &= 0x7f;
if (pHT->IOTAction & HT_IOT_ACT_DISABLE_MCS14)
- pCapELE->MCS[1] &= 0xbf;
+ pCapELE->cap_mcs[1] &= 0xbf;
if (pHT->IOTAction & HT_IOT_ACT_DISABLE_ALL_2SS)
- pCapELE->MCS[1] &= 0x00;
+ pCapELE->cap_mcs[1] &= 0x00;
/*
* 2008.06.12
@@ -596,7 +596,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u
int i;
for (i = 1; i < 16; i++)
- pCapELE->MCS[i] = 0;
+ pCapELE->cap_mcs[i] = 0;
}
//Extended HT Capability Info
@@ -1037,10 +1037,10 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
* Handle Ralink AP bad MCS rate set condition. Joseph.
* This fix the bug of Ralink AP. This may be removed in the future.
*/
- if (pPeerHTCap->MCS[0] == 0)
- pPeerHTCap->MCS[0] = 0xff;
+ if (pPeerHTCap->cap_mcs[0] == 0)
+ pPeerHTCap->cap_mcs[0] = 0xff;
- HTFilterMCSRate(ieee, pPeerHTCap->MCS, ieee->dot11HTOperationalRateSet);
+ HTFilterMCSRate(ieee, pPeerHTCap->cap_mcs, ieee->dot11HTOperationalRateSet);
/*
* Config MIMO Power Save setting
--
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 - Style 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 ` [PATCH 15/21] staging:rtl8192u: Rename MaxRxAMPDUFactor " John Whitmore
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 ` John Whitmore [this message]
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-19-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).