lkml.org 
[lkml]   [2018]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/21] staging:rtl8192u: Rename ShortGI40Mhz - Style
    Date
    Rename the bitfield member 'ShortGI40Mhz' to 'short_gi40_mhz', this
    clears the checkpatch issue with CamelCase naming.

    This change is a simple coding style change, which should have no
    impact on runtime code execution.

    Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
    ---
    drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 2 +-
    drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 2 +-
    drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 10 +++++-----
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
    index a0e91763e7f3..a6fe975902bb 100644
    --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
    +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
    @@ -156,7 +156,7 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,
    ht_cap = (struct ht_capability_ele *)&network->bssht.bdHTCapBuf[0];
    is40M = (ht_cap->chl_width)?1:0;
    isShortGI = (ht_cap->chl_width)?
    - ((ht_cap->ShortGI40Mhz)?1:0):
    + ((ht_cap->short_gi40_mhz)?1:0):
    ((ht_cap->short_gi20_mhz)?1:0);

    max_mcs = HTGetHighestMCSRate(ieee, ht_cap->MCS, MCS_FILTER_ALL);
    diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
    index 64fd6a4f3bcd..23f8ee39e32d 100644
    --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
    +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
    @@ -44,7 +44,7 @@ struct ht_capability_ele {
    u8 mimo_power_save:2;
    u8 not_used_green_field:1;
    u8 short_gi20_mhz:1;
    - u8 ShortGI40Mhz:1;
    + u8 short_gi40_mhz:1;
    u8 TxSTBC:1;
    u8 RxSTBC:2;
    u8 DelayBA:1;
    diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    index fe8d75d8bd96..54c56cec612f 100644
    --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    @@ -144,7 +144,7 @@ void HTDebugHTCapability(u8 *CapIE, u8 *TitleString)

    IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSupported Channel Width = %s\n", (pCapELE->chl_width) ? "20MHz" : "20/40MHz");
    IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSupport Short GI for 20M = %s\n", (pCapELE->short_gi20_mhz) ? "YES" : "NO");
    - IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSupport Short GI for 40M = %s\n", (pCapELE->ShortGI40Mhz) ? "YES" : "NO");
    + IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSupport Short GI for 40M = %s\n", (pCapELE->short_gi40_mhz) ? "YES" : "NO");
    IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSupport TX STBC = %s\n", (pCapELE->TxSTBC) ? "YES" : "NO");
    IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMax AMSDU Size = %s\n", (pCapELE->MaxAMSDUSize) ? "3839" : "7935");
    IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSupport CCK in 20/40 mode = %s\n", (pCapELE->DssCCk) ? "YES" : "NO");
    @@ -248,7 +248,7 @@ static bool IsHTHalfNmodeSGI(struct ieee80211_device *ieee, bool is40MHz)
    else if (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) // station in half n mode
    retValue = false;
    else if (is40MHz) { // ap support 40 bw
    - if (((struct ht_capability_ele *)(pHTInfo->PeerHTCapBuf))->ShortGI40Mhz) // ap support 40 bw short GI
    + if (((struct ht_capability_ele *)(pHTInfo->PeerHTCapBuf))->short_gi40_mhz) // ap support 40 bw short GI
    retValue = true;
    else
    retValue = false;
    @@ -558,9 +558,9 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u
    // pCapELE->chl_width = (pHT->bRegBW40MHz?1:0);
    pCapELE->mimo_power_save = pHT->SelfMimoPs;
    pCapELE->short_gi20_mhz = 1; // We can receive Short GI!!
    - pCapELE->ShortGI40Mhz = 1; // We can receive Short GI!!
    + pCapELE->short_gi40_mhz = 1; // We can receive Short GI!!
    //DbgPrint("TX HT cap/info ele BW=%d SG20=%d SG40=%d\n\r",
    - //pCapELE->chl_width, pCapELE->short_gi20_mhz, pCapELE->ShortGI40Mhz);
    + //pCapELE->chl_width, pCapELE->short_gi20_mhz, pCapELE->short_gi40_mhz);
    pCapELE->TxSTBC = 1;
    pCapELE->RxSTBC = 0;
    pCapELE->DelayBA = 0; // Do not support now!!
    @@ -946,7 +946,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
    pHTInfo->bCurShortGI20MHz = pHTInfo->bRegShortGI20MHz &&
    (pPeerHTCap->short_gi20_mhz == 1);
    pHTInfo->bCurShortGI40MHz = pHTInfo->bRegShortGI40MHz &&
    - (pPeerHTCap->ShortGI40Mhz == 1);
    + (pPeerHTCap->short_gi40_mhz == 1);

    /*
    * Config TX STBC setting
    --
    2.18.0
    \
     
     \ /
      Last update: 2018-08-29 22:37    [W:6.732 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site