lkml.org 
[lkml]   [2018]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/12] staging:rtl8192u: rename HT_EXTCHNL_OFFSET -> enum ht_extension_chan_width
    Date
    remove the typedef of enumerated type HT_EXTCHNL_OFFSET and replace it with
    'enum ht_extension_chan_offset'

    Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
    ---
    drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 ++--
    drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +-
    drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 6 +++---
    drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 6 +++---
    drivers/staging/rtl8192u/r819xU_phy.c | 5 +++--
    drivers/staging/rtl8192u/r819xU_phy.h | 2 +-
    6 files changed, 13 insertions(+), 12 deletions(-)

    diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
    index 8ca24c10c28e..3b7968681f77 100644
    --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
    +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
    @@ -2002,7 +2002,7 @@ struct ieee80211_device {
    short (*check_nic_enough_desc)(struct net_device *dev, int queue_index);
    //added by wb for HT related
    // void (*SwChnlByTimerHandler)(struct net_device *dev, int channel);
    - void (*SetBWModeHandler)(struct net_device *dev, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
    + void (*SetBWModeHandler)(struct net_device *dev, enum ht_channel_width Bandwidth, enum ht_extension_chan_offset Offset);
    // void (*UpdateHalRATRTableHandler)(struct net_device* dev, u8* pMcsRate);
    bool (*GetNmodeSupportBySecCfg)(struct net_device *dev);
    void (*SetWirelessMode)(struct net_device *dev, u8 wireless_mode);
    @@ -2358,7 +2358,7 @@ void HTDebugHTCapability(u8 *CapIE, u8 *TitleString);
    void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString);

    void HTSetConnectBwMode(struct ieee80211_device *ieee,
    - enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
    + enum ht_channel_width Bandwidth, enum ht_extension_chan_offset Offset);
    void HTUpdateDefaultSetting(struct ieee80211_device *ieee);
    void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap,
    u8 *len, u8 isEncrypt);
    diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
    index 804d628ed9eb..81020fbcdc20 100644
    --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
    +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
    @@ -302,7 +302,7 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
    {
    struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, wx_sync_scan_wq);
    short chan;
    - HT_EXTCHNL_OFFSET chan_offset = 0;
    + enum ht_extension_chan_offset chan_offset = 0;
    enum ht_channel_width bandwidth = 0;
    int b40M = 0;

    diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
    index c13ca7f0f4dd..7d54a7cd9514 100644
    --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
    +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
    @@ -36,12 +36,12 @@ enum ht_channel_width {
    // Represent Extension Channel Offset in HT Capabilities
    // This is available only in 40Mhz mode.
    //
    -typedef enum _HT_EXTCHNL_OFFSET {
    +enum ht_extension_chan_offset {
    HT_EXTCHNL_OFFSET_NO_EXT = 0,
    HT_EXTCHNL_OFFSET_UPPER = 1,
    HT_EXTCHNL_OFFSET_NO_DEF = 2,
    HT_EXTCHNL_OFFSET_LOWER = 3,
    -}HT_EXTCHNL_OFFSET, *PHT_EXTCHNL_OFFSET;
    +};

    typedef enum _CHNLOP {
    CHNLOP_NONE = 0, // No Action now
    @@ -237,7 +237,7 @@ typedef struct _RT_HIGH_THROUGHPUT {
    u8 PeerMimoPs;

    // 40MHz Channel Offset settings.
    - HT_EXTCHNL_OFFSET CurSTAExtChnlOffset;
    + enum ht_extension_chan_offset CurSTAExtChnlOffset;
    u8 bCurTxBW40MHz; // If we use 40 MHz to Tx
    u8 PeerBandwidth;

    diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    index 86c63b217d3b..264d15fbcc6b 100644
    --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    @@ -894,7 +894,7 @@ static u8 HTFilterMCSRate(struct ieee80211_device *ieee, u8 *pSupportMCS,
    return true;
    }

    -void HTSetConnectBwMode(struct ieee80211_device *ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
    +void HTSetConnectBwMode(struct ieee80211_device *ieee, enum ht_channel_width Bandwidth, enum ht_extension_chan_offset Offset);
    void HTOnAssocRsp(struct ieee80211_device *ieee)
    {
    PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
    @@ -936,7 +936,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
    // IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_HT, pPeerHTInfo, sizeof(HT_INFORMATION_ELE));
    // Config Supported Channel Width setting
    //
    - HTSetConnectBwMode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));
    + HTSetConnectBwMode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), (enum ht_extension_chan_offset)(pPeerHTInfo->ExtChlOffset));

    pHTInfo->bCurTxBW40MHz = (pPeerHTInfo->RecommemdedTxWidth == 1);

    @@ -1290,7 +1290,7 @@ u8 HTCCheck(struct ieee80211_device *ieee, u8 *pFrame)
    /*
    * This function set bandwidth mode in protocol layer.
    */
    -void HTSetConnectBwMode(struct ieee80211_device *ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset)
    +void HTSetConnectBwMode(struct ieee80211_device *ieee, enum ht_channel_width Bandwidth, enum ht_extension_chan_offset Offset)
    {
    PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
    // u32 flags = 0;
    diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
    index 8bb14cc79d8a..98cfc222e241 100644
    --- a/drivers/staging/rtl8192u/r819xU_phy.c
    +++ b/drivers/staging/rtl8192u/r819xU_phy.c
    @@ -1663,8 +1663,9 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
    * notice: I doubt whether SetBWModeInProgress flag is necessary as we can
    * test whether current work in the queue or not.//do I?
    *****************************************************************************/
    -void rtl8192_SetBWMode(struct net_device *dev, enum ht_channel_width bandwidth,
    - HT_EXTCHNL_OFFSET offset)
    +void rtl8192_SetBWMode(struct net_device *dev,
    + enum ht_channel_width bandwidth,
    + enum ht_extension_chan_offset offset)
    {
    struct r8192_priv *priv = ieee80211_priv(dev);

    diff --git a/drivers/staging/rtl8192u/r819xU_phy.h b/drivers/staging/rtl8192u/r819xU_phy.h
    index ea0032643620..d2e69228ac8a 100644
    --- a/drivers/staging/rtl8192u/r819xU_phy.h
    +++ b/drivers/staging/rtl8192u/r819xU_phy.h
    @@ -81,7 +81,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev,
    u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel);
    void rtl8192_SetBWMode(struct net_device *dev,
    enum ht_channel_width bandwidth,
    - HT_EXTCHNL_OFFSET offset);
    + enum ht_extension_chan_offset offset);
    void rtl8192_SwChnl_WorkItem(struct net_device *dev);
    void rtl8192_SetBWModeWorkItem(struct net_device *dev);
    bool rtl8192_SetRFPowerState(struct net_device *dev,
    --
    2.18.0
    \
     
     \ /
      Last update: 2018-07-07 16:58    [W:2.242 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site