staging: rtl8192e: Convert typedef HT_EXTCHNL_OFFSET to enum ht_extchnl_offset
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
6e579119b1
commit
b678bd1ff5
|
@ -1264,7 +1264,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
|
|||
RT_TRACE(COMP_SWBW, "<==SetBWMode819xUsb()");
|
||||
}
|
||||
|
||||
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_extchnl_offset Offset)
|
||||
{
|
||||
struct r8192_priv *priv = rtllib_priv(dev);
|
||||
|
||||
|
|
|
@ -113,7 +113,7 @@ extern void rtl8192_phy_updateInitGain(struct net_device* dev);
|
|||
extern u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, enum rf90_radio_path eRFPath);
|
||||
|
||||
extern u8 rtl8192_phy_SwChnl(struct net_device* dev, u8 channel);
|
||||
extern void rtl8192_SetBWMode(struct net_device *dev, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
|
||||
extern void rtl8192_SetBWMode(struct net_device *dev, enum ht_channel_width Bandwidth, enum ht_extchnl_offset Offset);
|
||||
extern void rtl8192_SwChnl_WorkItem(struct net_device *dev);
|
||||
extern void rtl8192_SetBWModeWorkItem(struct net_device *dev);
|
||||
extern void InitialGain819xPci(struct net_device *dev, u8 Operation);
|
||||
|
|
|
@ -63,12 +63,12 @@ enum ht_channel_width {
|
|||
HT_CHANNEL_WIDTH_20_40 = 1,
|
||||
};
|
||||
|
||||
typedef enum _HT_EXTCHNL_OFFSET{
|
||||
enum ht_extchnl_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,
|
||||
|
@ -265,7 +265,7 @@ struct rt_hi_throughput {
|
|||
u8 SelfMimoPs;
|
||||
u8 PeerMimoPs;
|
||||
|
||||
HT_EXTCHNL_OFFSET CurSTAExtChnlOffset;
|
||||
enum ht_extchnl_offset CurSTAExtChnlOffset;
|
||||
u8 bCurTxBW40MHz;
|
||||
u8 PeerBandwidth;
|
||||
|
||||
|
|
|
@ -831,7 +831,7 @@ u8 HTFilterMCSRate( struct rtllib_device* ieee, u8* pSupportMCS, u8* pOperateMCS
|
|||
|
||||
return true;
|
||||
}
|
||||
void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
|
||||
void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, enum ht_extchnl_offset Offset);
|
||||
void HTOnAssocRsp(struct rtllib_device *ieee)
|
||||
{
|
||||
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
|
||||
|
@ -861,7 +861,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
|
|||
pPeerHTInfo = (struct ht_info_ele *)(pHTInfo->PeerHTInfoBuf);
|
||||
|
||||
RTLLIB_DEBUG_DATA(RTLLIB_DL_DATA|RTLLIB_DL_HT, pPeerHTCap, sizeof(struct ht_capab_ele));
|
||||
HTSetConnectBwMode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));
|
||||
HTSetConnectBwMode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), (enum ht_extchnl_offset)(pPeerHTInfo->ExtChlOffset));
|
||||
pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false);
|
||||
|
||||
pHTInfo->bCurShortGI20MHz=
|
||||
|
@ -1137,7 +1137,7 @@ u8 HTCCheck(struct rtllib_device* ieee, u8* pFrame)
|
|||
return false;
|
||||
}
|
||||
|
||||
void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset)
|
||||
void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, enum ht_extchnl_offset Offset)
|
||||
{
|
||||
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
|
||||
|
||||
|
|
|
@ -2094,7 +2094,7 @@ struct rtllib_device {
|
|||
|
||||
unsigned long status;
|
||||
short hwscan_ch_bk;
|
||||
HT_EXTCHNL_OFFSET chan_offset_bk;
|
||||
enum ht_extchnl_offset chan_offset_bk;
|
||||
enum ht_channel_width bandwidth_bk;
|
||||
u8 hwscan_sem_up;
|
||||
u8 CntAfterLink;
|
||||
|
@ -2512,7 +2512,7 @@ struct rtllib_device {
|
|||
/* check whether Tx hw resouce available */
|
||||
short (*check_nic_enough_desc)(struct net_device *dev, int queue_index);
|
||||
short (*get_nic_desc_num)(struct net_device *dev, int queue_index);
|
||||
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_extchnl_offset Offset);
|
||||
bool (*GetNmodeSupportBySecCfg)(struct net_device* dev);
|
||||
void (*SetWirelessMode)(struct net_device* dev, u8 wireless_mode);
|
||||
bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device* dev);
|
||||
|
@ -2884,7 +2884,7 @@ extern int rtllib_wx_get_rts(struct rtllib_device *ieee,
|
|||
extern void HTDebugHTCapability(u8* CapIE, u8* TitleString );
|
||||
extern void HTDebugHTInfo(u8* InfoIE, u8* TitleString);
|
||||
|
||||
void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
|
||||
void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, enum ht_extchnl_offset Offset);
|
||||
extern void HTUpdateDefaultSetting(struct rtllib_device* ieee);
|
||||
extern void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* len, u8 isEncrypt,bool bAssoc);
|
||||
extern void HTConstructInfoElement(struct rtllib_device* ieee, u8* posHTInfo, u8* len, u8 isEncrypt);
|
||||
|
|
|
@ -317,7 +317,7 @@ void rtllib_wx_sync_scan_wq(void *data)
|
|||
{
|
||||
struct rtllib_device *ieee = container_of_work_rsl(data, struct rtllib_device, wx_sync_scan_wq);
|
||||
short chan;
|
||||
HT_EXTCHNL_OFFSET chan_offset=0;
|
||||
enum ht_extchnl_offset chan_offset=0;
|
||||
enum ht_channel_width bandwidth=0;
|
||||
int b40M = 0;
|
||||
static int count = 0;
|
||||
|
|
Loading…
Reference in a new issue