hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging:rtl8192u: rename HT_CHANNEL_WIDTH -> enum ht_channel_width 

remove the typedef HT_CHANNEL_WIDTH and replace with 'enum ht_channel_width'

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John Whitmore 2018-07-07 15:55:02 +01:00 committed by Greg Kroah-Hartman
parent cd50699fe1
commit 854727247a
9 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8192u/ieee80211/ieee80211.h
View File

@ -2002,7 +2002,7 @@ struct ieee80211_device {
short (*check_nic_enough_desc)(struct net_device *dev, int queue_index); short (*check_nic_enough_desc)(struct net_device *dev, int queue_index);
//added by wb for HT related //added by wb for HT related
// void (*SwChnlByTimerHandler)(struct net_device *dev, int channel); // void (*SwChnlByTimerHandler)(struct net_device *dev, int channel);
void (*SetBWModeHandler)(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset); void (*SetBWModeHandler)(struct net_device *dev, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
// void (*UpdateHalRATRTableHandler)(struct net_device* dev, u8* pMcsRate); // void (*UpdateHalRATRTableHandler)(struct net_device* dev, u8* pMcsRate);
bool (*GetNmodeSupportBySecCfg)(struct net_device *dev); bool (*GetNmodeSupportBySecCfg)(struct net_device *dev);
void (*SetWirelessMode)(struct net_device *dev, u8 wireless_mode); 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 HTDebugHTInfo(u8 *InfoIE, u8 *TitleString);
void HTSetConnectBwMode(struct ieee80211_device *ieee, void HTSetConnectBwMode(struct ieee80211_device *ieee,
HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset); enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
void HTUpdateDefaultSetting(struct ieee80211_device *ieee); void HTUpdateDefaultSetting(struct ieee80211_device *ieee);
void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap,
u8 *len, u8 isEncrypt); u8 *len, u8 isEncrypt);

4
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
View File

@ -303,7 +303,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); struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, wx_sync_scan_wq);
short chan; short chan;
HT_EXTCHNL_OFFSET chan_offset = 0; HT_EXTCHNL_OFFSET chan_offset = 0;
HT_CHANNEL_WIDTH bandwidth = 0; enum ht_channel_width bandwidth = 0;
int b40M = 0; int b40M = 0;
chan = ieee->current_network.channel; chan = ieee->current_network.channel;
@ -320,7 +320,7 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) { if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) {
b40M = 1; b40M = 1;
chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset; chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;
bandwidth = (HT_CHANNEL_WIDTH)ieee->pHTInfo->bCurBW40MHz; bandwidth = (enum ht_channel_width)ieee->pHTInfo->bCurBW40MHz;
printk("Scan in 40M, force to 20M first:%d, %d\n", chan_offset, bandwidth); printk("Scan in 40M, force to 20M first:%d, %d\n", chan_offset, bandwidth);
ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
} }

4
drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
View File

@ -27,10 +27,10 @@
// //
// Represent Channel Width in HT Capabilities // Represent Channel Width in HT Capabilities
// //
typedef enum _HT_CHANNEL_WIDTH { enum ht_channel_width {
HT_CHANNEL_WIDTH_20 = 0, HT_CHANNEL_WIDTH_20 = 0,
HT_CHANNEL_WIDTH_20_40 = 1, HT_CHANNEL_WIDTH_20_40 = 1,
}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; };
// //
// Represent Extension Channel Offset in HT Capabilities // Represent Extension Channel Offset in HT Capabilities

6
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
View File

@ -894,7 +894,7 @@ static u8 HTFilterMCSRate(struct ieee80211_device *ieee, u8 *pSupportMCS,
return true; return true;
} }
void HTSetConnectBwMode(struct ieee80211_device *ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset); void HTSetConnectBwMode(struct ieee80211_device *ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
void HTOnAssocRsp(struct ieee80211_device *ieee) void HTOnAssocRsp(struct ieee80211_device *ieee)
{ {
PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; 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)); // IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_HT, pPeerHTInfo, sizeof(HT_INFORMATION_ELE));
// Config Supported Channel Width setting // Config Supported Channel Width setting
// //
HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset)); HTSetConnectBwMode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));
pHTInfo->bCurTxBW40MHz = (pPeerHTInfo->RecommemdedTxWidth == 1); 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. * This function set bandwidth mode in protocol layer.
*/ */
void HTSetConnectBwMode(struct ieee80211_device *ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset) void HTSetConnectBwMode(struct ieee80211_device *ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset)
{ {
PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
// u32 flags = 0; // u32 flags = 0;

2
drivers/staging/rtl8192u/r8190_rtl8256.c
View File

@ -23,7 +23,7 @@
* Note: 8226 support both 20M and 40 MHz * Note: 8226 support both 20M and 40 MHz
*-------------------------------------------------------------------------- *--------------------------------------------------------------------------
*/ */
void PHY_SetRF8256Bandwidth(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth) void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwidth)
{ {
u8 eRFPath; u8 eRFPath;
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);

2
drivers/staging/rtl8192u/r8190_rtl8256.h
View File

@ -14,7 +14,7 @@
#define RTL8225H #define RTL8225H
#define RTL819X_TOTAL_RF_PATH 2 /* for 8192U */ #define RTL819X_TOTAL_RF_PATH 2 /* for 8192U */
void PHY_SetRF8256Bandwidth(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth); void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwidth);
void PHY_RF8256_Config(struct net_device *dev); void PHY_RF8256_Config(struct net_device *dev);
void phy_RF8256_Config_ParaFile(struct net_device *dev); void phy_RF8256_Config_ParaFile(struct net_device *dev);
void PHY_SetRF8256CCKTxPower(struct net_device *dev, u8 powerlevel); void PHY_SetRF8256CCKTxPower(struct net_device *dev, u8 powerlevel);

2
drivers/staging/rtl8192u/r8192U.h
View File

@ -996,7 +996,7 @@ typedef struct r8192_priv {
u8 SwChnlStage; u8 SwChnlStage;
u8 SwChnlStep; u8 SwChnlStep;
u8 SetBWModeInProgress; u8 SetBWModeInProgress;
HT_CHANNEL_WIDTH CurrentChannelBW; enum ht_channel_width CurrentChannelBW;
u8 ChannelPlan; u8 ChannelPlan;
/* 8190 40MHz mode */ /* 8190 40MHz mode */
/* Control channel sub-carrier */ /* Control channel sub-carrier */

2
drivers/staging/rtl8192u/r819xU_phy.c
View File

@ -1663,7 +1663,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
* notice: I doubt whether SetBWModeInProgress flag is necessary as we can * notice: I doubt whether SetBWModeInProgress flag is necessary as we can
* test whether current work in the queue or not.//do I? * test whether current work in the queue or not.//do I?
*****************************************************************************/ *****************************************************************************/
void rtl8192_SetBWMode(struct net_device *dev, HT_CHANNEL_WIDTH bandwidth, void rtl8192_SetBWMode(struct net_device *dev, enum ht_channel_width bandwidth,
HT_EXTCHNL_OFFSET offset) HT_EXTCHNL_OFFSET offset)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);

3
drivers/staging/rtl8192u/r819xU_phy.h
View File

@ -79,7 +79,8 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev,
RF90_RADIO_PATH_E eRFPath); RF90_RADIO_PATH_E eRFPath);
u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel); u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel);
void rtl8192_SetBWMode(struct net_device *dev, HT_CHANNEL_WIDTH bandwidth, void rtl8192_SetBWMode(struct net_device *dev,
enum ht_channel_width bandwidth,
HT_EXTCHNL_OFFSET offset); HT_EXTCHNL_OFFSET offset);
void rtl8192_SwChnl_WorkItem(struct net_device *dev); void rtl8192_SwChnl_WorkItem(struct net_device *dev);
void rtl8192_SetBWModeWorkItem(struct net_device *dev); void rtl8192_SetBWModeWorkItem(struct net_device *dev);