As part of the cleanup of the driver, typedef statements are removed.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
---
drivers/staging/rtl8192e/r8190P_rtl8256.c | 3 +-
drivers/staging/rtl8192e/r8190P_rtl8256.h | 3 +-
drivers/staging/rtl8192e/r8192E_phy.c | 3 +-
drivers/staging/rtl8192e/r8192E_phy.h | 4 +-
drivers/staging/rtl8192e/rtl819x_HT.h | 123 +++++++++-----------------
drivers/staging/rtl8192e/rtl819x_HTProc.c | 115 ++++++++++++++----------
drivers/staging/rtl8192e/rtl_core.h | 4 +-
drivers/staging/rtl8192e/rtl_dm.c | 10 +-
drivers/staging/rtl8192e/rtllib.h | 20 +++--
drivers/staging/rtl8192e/rtllib_module.c | 2 +-
drivers/staging/rtl8192e/rtllib_rx.c | 19 +++-
drivers/staging/rtl8192e/rtllib_softmac.c | 4 +-
drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 +-
drivers/staging/rtl8192e/rtllib_tx.c | 8 +-
drivers/staging/rtl8192e/rtllib_wx.c | 8 +-
15 files changed, 166 insertions(+), 166 deletions(-)
diff --git a/drivers/staging/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/r8190P_rtl8256.c
index 9bb9c52..b057031 100644
--- a/drivers/staging/rtl8192e/r8190P_rtl8256.c
+++ b/drivers/staging/rtl8192e/r8190P_rtl8256.c
@@ -22,7 +22,8 @@
#include "r8192E_phy.h"
#include "r8190P_rtl8256.h"
-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;
struct r8192_priv *priv = rtllib_priv(dev);
diff --git a/drivers/staging/rtl8192e/r8190P_rtl8256.h b/drivers/staging/rtl8192e/r8190P_rtl8256.h
index 32d2822..d500d38 100644
--- a/drivers/staging/rtl8192e/r8190P_rtl8256.h
+++ b/drivers/staging/rtl8192e/r8190P_rtl8256.h
@@ -21,7 +21,8 @@
#define RTL8225H
#define RTL819X_TOTAL_RF_PATH 2
-extern void PHY_SetRF8256Bandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth);
+extern void PHY_SetRF8256Bandwidth(struct net_device *dev,
+ enum HT_CHANNEL_WIDTH Bandwidth);
extern bool PHY_RF8256_Config(struct net_device* dev);
extern bool phy_RF8256_Config_ParaFile(struct net_device* dev);
extern void PHY_SetRF8256CCKTxPower(struct net_device* dev, u8 powerlevel);
diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/r8192E_phy.c
index e0c9a13..36581b8 100644
--- a/drivers/staging/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/r8192E_phy.c
@@ -1279,7 +1279,8 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
RT_TRACE(COMP_SWBW, "<==SetBWMode819xUsb()");
}
-void rtl8192_SetBWMode(struct net_device *dev, 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);
diff --git a/drivers/staging/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/r8192E_phy.h
index 2ebe300..d874255 100644
--- a/drivers/staging/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/r8192E_phy.h
@@ -120,7 +120,9 @@ 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, 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);
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 8f049f8..beb0fcd 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -58,63 +58,29 @@ enum HT_MCS_RATE {
HT_MCS15 = 0x00008000,
};
-typedef enum _HT_CHANNEL_WIDTH{
+enum HT_CHANNEL_WIDTH {
HT_CHANNEL_WIDTH_20 = 0,
HT_CHANNEL_WIDTH_20_40 = 1,
-}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH;
+};
-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{
+enum CHNLOP {
CHNLOP_NONE = 0,
CHNLOP_SCAN = 1,
CHNLOP_SWBW = 2,
CHNLOP_SWCHNL = 3,
-} CHNLOP, *PCHNLOP;
+};
#define CHHLOP_IN_PROGRESS(_pHTInfo) \
((_pHTInfo)->ChnlOp > CHNLOP_NONE) ? true : false
-/*
-typedef union _HT_CAPABILITY{
- u16 ShortData;
- u8 CharData[2];
- struct
- {
- u16 AdvCoding:1;
- u16 ChlWidth:1;
- u16 MimoPwrSave:2;
- u16 GreenField:1;
- u16 ShortGI20Mhz:1;
- u16 ShortGI40Mhz:1;
- u16 STBC:1;
- u16 BeamForm:1;
- u16 DelayBA:1;
- u16 MaxAMSDUSize:1;
- u16 DssCCk:1;
- u16 PSMP:1;
- u16 Rsvd:3;
- }Field;
-}HT_CAPABILITY, *PHT_CAPABILITY;
-
-typedef union _HT_CAPABILITY_MACPARA{
- u8 ShortData;
- u8 CharData[1];
- struct
- {
- u8 MaxRxAMPDU:2;
- u8 MPDUDensity:2;
- u8 Rsvd:4;
- }Field;
-}HT_CAPABILITY_MACPARA, *PHT_CAPABILITY_MACPARA;
-*/
-
-typedef enum _HT_ACTION{
+enum HT_ACTION {
ACT_RECOMMAND_WIDTH = 0,
ACT_MIMO_PWR_SAVE = 1,
ACT_PSMP = 2,
@@ -125,18 +91,17 @@ typedef enum _HT_ACTION{
ACT_MIMO_NOCOMPR_STEER = 7,
ACT_MIMO_COMPR_STEER = 8,
ACT_ANTENNA_SELECT = 9,
-} HT_ACTION, *PHT_ACTION;
+};
-typedef enum _HT_Bandwidth_40MHZ_Sub_Carrier{
+enum HT_BW40_SC {
SC_MODE_DUPLICATE = 0,
SC_MODE_LOWER = 1,
SC_MODE_UPPER = 2,
SC_MODE_FULL40MHZ = 3,
-}HT_BW40_SC_E;
-
-typedef struct _HT_CAPABILITY_ELE{
+};
+struct HT_CAPABILITY_ELE {
u8 AdvCoding:1;
u8 ChlWidth:1;
u8 MimoPwrSave:2;
@@ -165,10 +130,10 @@ typedef struct _HT_CAPABILITY_ELE{
u8 ASCap;
-} __attribute__ ((packed)) HT_CAPABILITY_ELE, *PHT_CAPABILITY_ELE;
+} __packed;
-typedef struct _HT_INFORMATION_ELE{
+struct HT_INFORMATION_ELE {
u8 ControlChl;
u8 ExtChlOffset:2;
@@ -193,7 +158,7 @@ typedef struct _HT_INFORMATION_ELE{
u8 Rsvd4:4;
u8 BasicMSC[16];
-} __attribute__ ((packed)) HT_INFORMATION_ELE, *PHT_INFORMATION_ELE;
+} __packed;
typedef struct _MIMOPS_CTRL{
u8 MimoPsEnable:1;
@@ -213,7 +178,7 @@ typedef enum _HT_AGGRE_MODE_E{
}HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E;
-typedef struct _RT_HIGH_THROUGHPUT{
+struct RT_HIGH_THROUGHPUT {
u8 bEnableHT;
u8 bCurrentHTSupport;
@@ -232,8 +197,8 @@ typedef struct _RT_HIGH_THROUGHPUT{
HT_SPEC_VER ePeerHTSpecVer;
- HT_CAPABILITY_ELE SelfHTCap;
- HT_INFORMATION_ELE SelfHTInfo;
+ struct HT_CAPABILITY_ELE SelfHTCap;
+ struct HT_INFORMATION_ELE SelfHTInfo;
u8 PeerHTCapBuf[32];
u8 PeerHTInfoBuf[32];
@@ -265,12 +230,12 @@ typedef struct _RT_HIGH_THROUGHPUT{
u8 SelfMimoPs;
u8 PeerMimoPs;
- HT_EXTCHNL_OFFSET CurSTAExtChnlOffset;
+ enum HT_EXTCHNL_OFFSET CurSTAExtChnlOffset;
u8 bCurTxBW40MHz;
u8 PeerBandwidth;
u8 bSwBwInProgress;
- CHNLOP ChnlOp;
+ enum CHNLOP ChnlOp;
u8 SwBwStep;
u8 bRegRT2RTAggregation;
@@ -295,11 +260,11 @@ typedef struct _RT_HIGH_THROUGHPUT{
u8 WAIotTH;
u8 bAcceptAddbaReq;
-} __attribute__ ((packed)) RT_HIGH_THROUGHPUT, *PRT_HIGH_THROUGHPUT;
+} __packed;
-typedef struct _RT_HTINFO_STA_ENTRY{
+struct RT_HTINFO_STA_ENTRY {
u8 bEnableHT;
u8 bSupportCck;
@@ -327,15 +292,14 @@ typedef struct _RT_HTINFO_STA_ENTRY{
u16 nAMSDU_MaxSize;
-}RT_HTINFO_STA_ENTRY, *PRT_HTINFO_STA_ENTRY;
-
+};
-typedef struct _BSS_HT{
+struct BSS_HT {
u8 bdSupportHT;
u8 bdHTCapBuf[32];
@@ -344,29 +308,29 @@ typedef struct _BSS_HT{
u16 bdHTInfoLen;
HT_SPEC_VER bdHTSpecVer;
- HT_CHANNEL_WIDTH bdBandWidth;
+ enum HT_CHANNEL_WIDTH bdBandWidth;
u8 bdRT2RTAggregation;
u8 bdRT2RTLongSlotTime;
u8 RT2RT_HT_Mode;
u8 bdHT1R;
-} __attribute__ ((packed)) BSS_HT, *PBSS_HT;
+} __packed;
-typedef struct _MIMO_RSSI{
+struct MIMO_RSSI {
u32 EnableAntenna;
u32 AntennaA;
u32 AntennaB;
u32 AntennaC;
u32 AntennaD;
u32 Average;
-}MIMO_RSSI, *PMIMO_RSSI;
+};
-typedef struct _MIMO_EVM{
+struct MIMO_EVM {
u32 EVM1;
u32 EVM2;
-}MIMO_EVM, *PMIMO_EVM;
+};
-typedef struct _FALSE_ALARM_STATISTICS{
+struct FALSE_ALARM_STATISTICS {
u32 Cnt_Parity_Fail;
u32 Cnt_Rate_Illegal;
u32 Cnt_Crc8_fail;
@@ -374,7 +338,7 @@ typedef struct _FALSE_ALARM_STATISTICS{
u32 Cnt_Ofdm_fail;
u32 Cnt_Cck_fail;
u32 Cnt_all;
-}FALSE_ALARM_STATISTICS, *PFALSE_ALARM_STATISTICS;
+};
extern u8 MCS_FILTER_ALL[16];
@@ -397,15 +361,14 @@ extern u8 MCS_FILTER_1SS[16];
#define IS_11N_MCS_RATE(rate) (rate&0x80)
-typedef enum _HT_AGGRE_SIZE{
+enum HT_AGGRE_SIZE {
HT_AGG_SIZE_8K = 0,
HT_AGG_SIZE_16K = 1,
HT_AGG_SIZE_32K = 2,
HT_AGG_SIZE_64K = 3,
-}HT_AGGRE_SIZE_E, *PHT_AGGRE_SIZE_E;
+};
-typedef enum _HT_IOT_PEER
-{
+enum HT_IOT_PEER {
HT_IOT_PEER_UNKNOWN = 0,
HT_IOT_PEER_REALTEK = 1,
HT_IOT_PEER_REALTEK_92SE = 2,
@@ -418,14 +381,14 @@ typedef enum _HT_IOT_PEER
HT_IOT_PEER_SELF_SOFTAP = 9,
HT_IOT_PEER_AIRGO = 10,
HT_IOT_PEER_MAX = 11,
-}HT_IOT_PEER_E, *PHTIOT_PEER_E;
+};
-typedef enum _HT_IOT_PEER_SUBTYPE
+enum HT_IOT_PEER_SUBTYPE
{
HT_IOT_PEER_ATHEROS_DIR635 = 0,
-}HT_IOT_PEER_SUBTYPE_E, *PHTIOT_PEER_SUBTYPE_E;
+};
-typedef enum _HT_IOT_ACTION{
+enum HT_IOT_ACTION{
HT_IOT_ACT_TX_USE_AMSDU_4K = 0x00000001,
HT_IOT_ACT_TX_USE_AMSDU_8K = 0x00000002,
HT_IOT_ACT_DISABLE_MCS14 = 0x00000004,
@@ -458,21 +421,21 @@ typedef enum _HT_IOT_ACTION{
HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI = 0x08000000,
-}HT_IOT_ACTION_E, *PHT_IOT_ACTION_E;
+};
-typedef enum _HT_IOT_RAFUNC{
+enum HT_IOT_RAFUNC{
HT_IOT_RAFUNC_DISABLE_ALL = 0x00,
HT_IOT_RAFUNC_PEER_1R = 0x01,
HT_IOT_RAFUNC_TX_AMSDU = 0x02,
-}HT_IOT_RAFUNC, *PHT_IOT_RAFUNC;
+};
-typedef enum _RT_HT_CAP{
+enum RT_HT_CAPBILITY {
RT_HT_CAP_USE_TURBO_AGGR = 0x01,
RT_HT_CAP_USE_LONG_PREAMBLE = 0x02,
RT_HT_CAP_USE_AMPDU = 0x04,
RT_HT_CAP_USE_WOW = 0x8,
RT_HT_CAP_USE_SOFTAP = 0x10,
RT_HT_CAP_USE_92SE = 0x20,
-}RT_HT_CAPBILITY, *PRT_HT_CAPBILITY;
+};
#endif
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index a457e30..5491fdf 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -59,7 +59,7 @@ static u8 CISCO_BROADCOM[3] = {0x00, 0x17, 0x94};
static u8 LINKSYS_MARVELL_4400N[3] = {0x00, 0x14, 0xa4};
void HTUpdateDefaultSetting(struct rtllib_device* ieee)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
pHTInfo->bAcceptAddbaReq = 1;
@@ -98,14 +98,14 @@ void HTDebugHTCapability(u8* CapIE, u8* TitleString )
{
static u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};
- PHT_CAPABILITY_ELE pCapELE;
+ struct HT_CAPABILITY_ELE *pCapELE;
if (!memcmp(CapIE, EWC11NHTCap, sizeof(EWC11NHTCap)))
{
RTLLIB_DEBUG(RTLLIB_DL_HT, "EWC IE in %s()\n", __func__);
- pCapELE = (PHT_CAPABILITY_ELE)(&CapIE[4]);
+ pCapELE = (struct HT_CAPABILITY_ELE *)(&CapIE[4]);
}else
- pCapELE = (PHT_CAPABILITY_ELE)(&CapIE[0]);
+ pCapELE = (struct HT_CAPABILITY_ELE *)(&CapIE[0]);
RTLLIB_DEBUG(RTLLIB_DL_HT, "<Log HT Capability>. Called by %s\n", TitleString );
@@ -122,18 +122,19 @@ void HTDebugHTCapability(u8* CapIE, u8* TitleString )
return;
}
+
void HTDebugHTInfo(u8* InfoIE, u8* TitleString)
{
static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34};
- PHT_INFORMATION_ELE pHTInfoEle;
+ struct HT_INFORMATION_ELE *pHTInfoEle;
if (!memcmp(InfoIE, EWC11NHTInfo, sizeof(EWC11NHTInfo)))
{
RTLLIB_DEBUG(RTLLIB_DL_HT, "EWC IE in %s()\n", __func__);
- pHTInfoEle = (PHT_INFORMATION_ELE)(&InfoIE[4]);
+ pHTInfoEle = (struct HT_INFORMATION_ELE *)(&InfoIE[4]);
}else
- pHTInfoEle = (PHT_INFORMATION_ELE)(&InfoIE[0]);
+ pHTInfoEle = (struct HT_INFORMATION_ELE *)(&InfoIE[0]);
RTLLIB_DEBUG(RTLLIB_DL_HT, "<Log HT Information Element>. Called by %s\n", TitleString);
@@ -182,7 +183,7 @@ void HTDebugHTInfo(u8* InfoIE, u8* TitleString)
bool IsHTHalfNmode40Bandwidth(struct rtllib_device* ieee)
{
bool retValue = false;
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
if (pHTInfo->bCurrentHTSupport == false )
retValue = false;
@@ -190,7 +191,8 @@ bool IsHTHalfNmode40Bandwidth(struct rtllib_device* ieee)
retValue = false;
else if (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
retValue = false;
- else if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ChlWidth)
+ else if (((struct HT_CAPABILITY_ELE *)
+ (pHTInfo->PeerHTCapBuf))->ChlWidth)
retValue = true;
else
retValue = false;
@@ -201,7 +203,7 @@ bool IsHTHalfNmode40Bandwidth(struct rtllib_device* ieee)
bool IsHTHalfNmodeSGI(struct rtllib_device* ieee, bool is40MHz)
{
bool retValue = false;
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
if (pHTInfo->bCurrentHTSupport == false )
retValue = false;
@@ -209,14 +211,16 @@ bool IsHTHalfNmodeSGI(struct rtllib_device* ieee, bool is40MHz)
retValue = false;
else if (is40MHz)
{
- if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ShortGI40Mhz)
+ if (((struct HT_CAPABILITY_ELE *)
+ (pHTInfo->PeerHTCapBuf))->ShortGI40Mhz)
retValue = true;
else
retValue = false;
}
else
{
- if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ShortGI20Mhz)
+ if (((struct HT_CAPABILITY_ELE *)
+ (pHTInfo->PeerHTCapBuf))->ShortGI20Mhz)
retValue = true;
else
retValue = false;
@@ -240,7 +244,7 @@ u16 HTHalfMcsToDataRate(struct rtllib_device* ieee, u8 nMcsRate)
u16 HTMcsToDataRate( struct rtllib_device* ieee, u8 nMcsRate)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
u8 is40MHz = (pHTInfo->bCurBW40MHz)?1:0;
u8 isShortGI = (pHTInfo->bCurBW40MHz)?
@@ -318,7 +322,7 @@ bool IsHTHalfNmodeAPs(struct rtllib_device* ieee)
void HTIOTPeerDetermine(struct rtllib_device* ieee)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
struct rtllib_network* net = &ieee->current_network;
if (net->bssht.bdRT2RTAggregation){
pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK;
@@ -409,7 +413,7 @@ u8 HTIOTActIsMgntUseCCK6M(struct rtllib_device* ieee,struct rtllib_network *netw
u8
HTIOTActWAIOTBroadcom(struct rtllib_device* ieee)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
u8 retValue = false;
u8 boundary=59;
@@ -494,7 +498,7 @@ u8
HTIOTActDisableShortGI(struct rtllib_device* ieee,struct rtllib_network *network)
{
u8 retValue = 0;
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
if (pHTInfo->IOTPeer==HT_IOT_PEER_RALINK)
{
@@ -515,7 +519,7 @@ HTIOTActDisableHighPower(struct rtllib_device* ieee,struct rtllib_network *netwo
void
HTIOTActDetermineRaFunc(struct rtllib_device* ieee, bool bPeerRx2ss)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
pHTInfo->IOTRaFunc &= HT_IOT_RAFUNC_DISABLE_ALL;
if (pHTInfo->IOTPeer == HT_IOT_PEER_RALINK && !bPeerRx2ss)
@@ -572,9 +576,7 @@ HTIOTActIsNullDataPowerSaving(struct rtllib_device* ieee,struct rtllib_network *
return retValue;
}
-void HTResetIOTSetting(
- PRT_HIGH_THROUGHPUT pHTInfo
-)
+void HTResetIOTSetting(struct RT_HIGH_THROUGHPUT *pHTInfo)
{
pHTInfo->IOTAction = 0;
pHTInfo->IOTPeer = HT_IOT_PEER_UNKNOWN;
@@ -584,8 +586,8 @@ void HTResetIOTSetting(
void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* len, u8 IsEncrypt, bool bAssoc)
{
- PRT_HIGH_THROUGHPUT pHT = ieee->pHTInfo;
- PHT_CAPABILITY_ELE pCapELE = NULL;
+ struct RT_HIGH_THROUGHPUT *pHT = ieee->pHTInfo;
+ struct HT_CAPABILITY_ELE *pCapELE = NULL;
if ((posHTCap == NULL) || (pHT == NULL))
{
@@ -598,11 +600,11 @@ void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8*
{
u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};
memcpy(posHTCap, EWC11NHTCap, sizeof(EWC11NHTCap));
- pCapELE = (PHT_CAPABILITY_ELE)&(posHTCap[4]);
+ pCapELE = (struct HT_CAPABILITY_ELE *)&(posHTCap[4]);
*len = 30 + 2;
}else
{
- pCapELE = (PHT_CAPABILITY_ELE)posHTCap;
+ pCapELE = (struct HT_CAPABILITY_ELE *)posHTCap;
*len = 26 + 2;
}
@@ -675,8 +677,10 @@ void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8*
}
void HTConstructInfoElement(struct rtllib_device* ieee, u8* posHTInfo, u8* len, u8 IsEncrypt)
{
- PRT_HIGH_THROUGHPUT pHT = ieee->pHTInfo;
- PHT_INFORMATION_ELE pHTInfoEle = (PHT_INFORMATION_ELE)posHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHT = ieee->pHTInfo;
+ struct HT_INFORMATION_ELE *pHTInfoEle =
+ (struct HT_INFORMATION_ELE *)posHTInfo;
+
if ((posHTInfo == NULL) || (pHTInfoEle == NULL))
{
RTLLIB_DEBUG(RTLLIB_DL_ERR, "posHTInfo or pHTInfoEle can't be null in HTConstructInfoElement()\n");
@@ -831,12 +835,15 @@ u8 HTFilterMCSRate( struct rtllib_device* ieee, u8* pSupportMCS, u8* pOperateMCS
return true;
}
-void HTSetConnectBwMode(struct rtllib_device* ieee, 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)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
- PHT_CAPABILITY_ELE pPeerHTCap = NULL;
- PHT_INFORMATION_ELE pPeerHTInfo = NULL;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
+ struct HT_CAPABILITY_ELE *pPeerHTCap = NULL;
+ struct HT_INFORMATION_ELE *pPeerHTInfo = NULL;
u16 nMaxAMSDUSize = 0;
u8* pMcsFilter = NULL;
@@ -851,17 +858,23 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
RTLLIB_DEBUG(RTLLIB_DL_HT, "===> HTOnAssocRsp_wq(): HT_ENABLE\n");
if (!memcmp(pHTInfo->PeerHTCapBuf,EWC11NHTCap, sizeof(EWC11NHTCap)))
- pPeerHTCap = (PHT_CAPABILITY_ELE)(&pHTInfo->PeerHTCapBuf[4]);
+ pPeerHTCap = (struct HT_CAPABILITY_ELE *)
+ (&pHTInfo->PeerHTCapBuf[4]);
else
- pPeerHTCap = (PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf);
+ pPeerHTCap = (struct HT_CAPABILITY_ELE *)
+ (pHTInfo->PeerHTCapBuf);
if (!memcmp(pHTInfo->PeerHTInfoBuf, EWC11NHTInfo, sizeof(EWC11NHTInfo)))
- pPeerHTInfo = (PHT_INFORMATION_ELE)(&pHTInfo->PeerHTInfoBuf[4]);
+ pPeerHTInfo = (struct HT_INFORMATION_ELE *)
+ (&pHTInfo->PeerHTInfoBuf[4]);
else
- pPeerHTInfo = (PHT_INFORMATION_ELE)(pHTInfo->PeerHTInfoBuf);
+ pPeerHTInfo = (struct HT_INFORMATION_ELE *)
+ (pHTInfo->PeerHTInfoBuf);
- RTLLIB_DEBUG_DATA(RTLLIB_DL_DATA|RTLLIB_DL_HT, pPeerHTCap, sizeof(HT_CAPABILITY_ELE));
- HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));
+ RTLLIB_DEBUG_DATA(RTLLIB_DL_DATA | RTLLIB_DL_HT, pPeerHTCap,
+ sizeof(struct HT_CAPABILITY_ELE));
+ HTSetConnectBwMode(ieee, (enum HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth),
+ (enum HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));
pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false);
pHTInfo->bCurShortGI20MHz=
@@ -946,7 +959,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
void HTSetConnectBwModeCallback(struct rtllib_device* ieee);
void HTInitializeHTInfo(struct rtllib_device* ieee)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
RTLLIB_DEBUG(RTLLIB_DL_HT, "===========>%s()\n", __func__);
pHTInfo->bCurrentHTSupport = false;
@@ -977,7 +990,7 @@ void HTInitializeHTInfo(struct rtllib_device* ieee)
pHTInfo->bCurrentRT2RTAggregation = false;
pHTInfo->bCurrentRT2RTLongSlotTime = false;
- pHTInfo->RT2RT_HT_Mode = (RT_HT_CAPBILITY)0;
+ pHTInfo->RT2RT_HT_Mode = (enum RT_HT_CAPBILITY)0;
pHTInfo->IOTPeer = 0;
pHTInfo->IOTAction = 0;
@@ -990,7 +1003,8 @@ void HTInitializeHTInfo(struct rtllib_device* ieee)
RegHTSuppRateSets[4] = 0x01;
}
}
-void HTInitializeBssDesc(PBSS_HT pBssHT)
+
+void HTInitializeBssDesc(struct BSS_HT *pBssHT)
{
pBssHT->bdSupportHT = false;
@@ -1003,12 +1017,12 @@ void HTInitializeBssDesc(PBSS_HT pBssHT)
pBssHT->bdRT2RTAggregation = false;
pBssHT->bdRT2RTLongSlotTime = false;
- pBssHT->RT2RT_HT_Mode = (RT_HT_CAPBILITY)0;
+ pBssHT->RT2RT_HT_Mode = (enum RT_HT_CAPBILITY)0;
}
void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_network * pNetwork)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
u8 bIOTAction = 0;
RTLLIB_DEBUG(RTLLIB_DL_HT, "==============>%s()\n", __func__);
@@ -1034,7 +1048,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_net
{
pHTInfo->bCurrentRT2RTAggregation = false;
pHTInfo->bCurrentRT2RTLongSlotTime = false;
- pHTInfo->RT2RT_HT_Mode = (RT_HT_CAPBILITY)0;
+ pHTInfo->RT2RT_HT_Mode = (enum RT_HT_CAPBILITY)0;
}
HTIOTPeerDetermine(ieee);
@@ -1067,7 +1081,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_net
pHTInfo->bCurrentHTSupport = false;
pHTInfo->bCurrentRT2RTAggregation = false;
pHTInfo->bCurrentRT2RTLongSlotTime = false;
- pHTInfo->RT2RT_HT_Mode = (RT_HT_CAPBILITY)0;
+ pHTInfo->RT2RT_HT_Mode = (enum RT_HT_CAPBILITY)0;
pHTInfo->IOTAction = 0;
pHTInfo->IOTRaFunc = 0;
@@ -1077,8 +1091,9 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_net
void HTUpdateSelfAndPeerSetting(struct rtllib_device* ieee, struct rtllib_network * pNetwork)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
- PHT_INFORMATION_ELE pPeerHTInfo = (PHT_INFORMATION_ELE)pNetwork->bssht.bdHTInfoBuf;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
+ struct HT_INFORMATION_ELE *pPeerHTInfo =
+ (struct HT_INFORMATION_ELE *)pNetwork->bssht.bdHTInfoBuf;
if (pHTInfo->bCurrentHTSupport)
{
@@ -1090,7 +1105,7 @@ void HTUpdateSelfAndPeerSetting(struct rtllib_device* ieee, struct rtllib_networ
void HTUseDefaultSetting(struct rtllib_device* ieee)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
if (pHTInfo->bEnableHT) {
pHTInfo->bCurrentHTSupport = true;
@@ -1137,9 +1152,11 @@ u8 HTCCheck(struct rtllib_device* ieee, u8* pFrame)
return false;
}
-void HTSetConnectBwMode(struct rtllib_device* ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset)
+void HTSetConnectBwMode(struct rtllib_device *ieee,
+ enum HT_CHANNEL_WIDTH Bandwidth,
+ enum HT_EXTCHNL_OFFSET Offset)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
if (pHTInfo->bRegBW40MHz == false)
return;
@@ -1178,7 +1195,7 @@ void HTSetConnectBwMode(struct rtllib_device* ieee, HT_CHANNEL_WIDTH Bandwidth,
void HTSetConnectBwModeCallback(struct rtllib_device* ieee)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
RTLLIB_DEBUG(RTLLIB_DL_HT, "======>%s()\n", __func__);
if (pHTInfo->bCurBW40MHz)
diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h
index 5e8e989..e4dd2de 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -604,7 +604,7 @@ typedef struct r8192_priv
RT_RF_TYPE_819xU rf_chip;
IC_INFERIORITY_8192S IC_Class;
- HT_CHANNEL_WIDTH CurrentChannelBW;
+ enum HT_CHANNEL_WIDTH CurrentChannelBW;
struct BB_REGISTER_DEFINITION PHYRegDef[4];
rate_adaptive rate_adaptive;
@@ -891,7 +891,7 @@ typedef struct r8192_priv
u8 DynamicTxHighPowerLvl;
u8 LastDTPLvl;
u32 CurrentRATR0;
- FALSE_ALARM_STATISTICS FalseAlmCnt;
+ struct FALSE_ALARM_STATISTICS FalseAlmCnt;
u8 DMFlag;
u8 DM_Type;
diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl_dm.c
index ca3001b..e5adf63 100644
--- a/drivers/staging/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl_dm.c
@@ -294,7 +294,7 @@ extern void init_rate_adaptive(struct net_device * dev)
static void dm_check_rate_adaptive(struct net_device * dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
- PRT_HIGH_THROUGHPUT pHTInfo = priv->rtllib->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = priv->rtllib->pHTInfo;
prate_adaptive pra = (prate_adaptive)&priv->rate_adaptive;
u32 currentRATR, targetRATR = 0;
u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0;
@@ -1916,7 +1916,7 @@ void dm_FalseAlarmCounterStatistics(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
u32 ret_value;
- PFALSE_ALARM_STATISTICS FalseAlmCnt = &(priv->FalseAlmCnt);
+ struct FALSE_ALARM_STATISTICS *FalseAlmCnt = &(priv->FalseAlmCnt);
ret_value = rtl8192_QueryBBReg(dev, rOFDM_PHYCounter1, bMaskDWord);
FalseAlmCnt->Cnt_Parity_Fail = ((ret_value&0xffff0000)>>16);
@@ -2493,7 +2493,7 @@ static void dm_check_edca_turbo(
struct net_device * dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
- PRT_HIGH_THROUGHPUT pHTInfo = priv->rtllib->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = priv->rtllib->pHTInfo;
static unsigned long lastTxOkCnt = 0;
static unsigned long lastRxOkCnt = 0;
@@ -2621,7 +2621,7 @@ static void dm_init_ctstoself(struct net_device * dev)
static void dm_ctstoself(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);
- PRT_HIGH_THROUGHPUT pHTInfo = priv->rtllib->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = priv->rtllib->pHTInfo;
static unsigned long lastTxOkCnt = 0;
static unsigned long lastRxOkCnt = 0;
unsigned long curTxOkCnt = 0;
@@ -2655,7 +2655,7 @@ static void
dm_Init_WA_Broadcom_IOT(struct net_device * dev)
{
struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);
- PRT_HIGH_THROUGHPUT pHTInfo = priv->rtllib->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = priv->rtllib->pHTInfo;
pHTInfo->bWAIotBroadcom = false;
pHTInfo->WAIotTH = WAIotTHVal;
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 0c161ed..7ad709c 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1687,7 +1687,7 @@ struct rtllib_network {
u8 Turbo_Enable;
u16 CountryIeLen;
u8 CountryIeBuf[MAX_IE_LEN];
- BSS_HT bssht;
+ struct BSS_HT bssht;
bool broadcom_cap_exist;
bool realtek_cap_exit;
bool marvell_cap_exist;
@@ -2100,8 +2100,8 @@ struct rtllib_device {
unsigned long status;
short hwscan_ch_bk;
- HT_EXTCHNL_OFFSET chan_offset_bk;
- HT_CHANNEL_WIDTH bandwidth_bk;
+ enum HT_EXTCHNL_OFFSET chan_offset_bk;
+ enum HT_CHANNEL_WIDTH bandwidth_bk;
u8 hwscan_sem_up;
u8 CntAfterLink;
@@ -2138,7 +2138,7 @@ struct rtllib_device {
RT_RF_CHANGE_SOURCE RfOffReason;
bool is_set_key;
bool wx_set_enc;
- PRT_HIGH_THROUGHPUT pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo;
spinlock_t bw_spinlock;
spinlock_t reorder_spinlock;
@@ -2518,7 +2518,9 @@ 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, 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);
@@ -2890,21 +2892,23 @@ 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, 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);
extern void HTConstructRT2RTAggElement(struct rtllib_device* ieee, u8* posRT2RTAgg, u8* len);
extern void HTOnAssocRsp(struct rtllib_device *ieee);
extern void HTInitializeHTInfo(struct rtllib_device* ieee);
-extern void HTInitializeBssDesc(PBSS_HT pBssHT);
+extern void HTInitializeBssDesc(struct BSS_HT *pBssHT);
extern void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_network * pNetwork);
extern void HTUpdateSelfAndPeerSetting(struct rtllib_device* ieee, struct rtllib_network * pNetwork);
extern u8 HTGetHighestMCSRate(struct rtllib_device* ieee, u8* pMCSRateSet, u8* pMCSFilter);
extern u8 MCS_FILTER_ALL[];
extern u16 MCS_DATA_RATE[2][2][77] ;
extern u8 HTCCheck(struct rtllib_device* ieee, u8* pFrame);
-extern void HTResetIOTSetting(PRT_HIGH_THROUGHPUT pHTInfo);
+extern void HTResetIOTSetting(struct RT_HIGH_THROUGHPUT *pHTInfo);
extern bool IsHTHalfNmodeAPs(struct rtllib_device* ieee);
extern u16 HTHalfMcsToDataRate(struct rtllib_device* ieee, u8 nMcsRate);
extern u16 HTMcsToDataRate( struct rtllib_device* ieee, u8 nMcsRate);
diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
index 3462e44..edba7567 100644
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_module.c
@@ -162,7 +162,7 @@ struct net_device *alloc_rtllib(int sizeof_priv)
memset(ieee->swcamtable,0,sizeof(SW_CAM_TABLE)*32);
rtllib_softmac_init(ieee);
- ieee->pHTInfo = (RT_HIGH_THROUGHPUT*)kzalloc(sizeof(RT_HIGH_THROUGHPUT), GFP_KERNEL);
+ ieee->pHTInfo = kzalloc(sizeof(struct RT_HIGH_THROUGHPUT), GFP_KERNEL);
if (ieee->pHTInfo == NULL)
{
RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc memory for HTInfo\n");
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 2c4e777..841ec8b 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -562,7 +562,7 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee,
PRX_TS_RECORD pTS,
u16 SeqNum)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
PRX_REORDER_ENTRY pReorderEntry = NULL;
struct rtllib_rxb* prxbIndicateArray[REORDER_WIN_SIZE];
u8 WinSize = pHTInfo->RxReorderWinSize;
@@ -1949,7 +1949,10 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
}
if (tmp_htcap_len != 0){
network->bssht.bdSupportHT = true;
- network->bssht.bdHT1R = ((((PHT_CAPABILITY_ELE)(network->bssht.bdHTCapBuf))->MCS[1]) == 0);
+ network->bssht.bdHT1R =
+ ((((struct HT_CAPABILITY_ELE *)
+ (network->bssht.bdHTCapBuf))->
+ MCS[1]) == 0);
}else{
network->bssht.bdSupportHT = false;
network->bssht.bdHT1R = false;
@@ -2155,9 +2158,15 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
memcpy(network->bssht.bdHTCapBuf,info_element->data,network->bssht.bdHTCapLen);
network->bssht.bdSupportHT = true;
- network->bssht.bdHT1R = ((((PHT_CAPABILITY_ELE)(network->bssht.bdHTCapBuf))->MCS[1]) == 0);
-
- network->bssht.bdBandWidth = (HT_CHANNEL_WIDTH)(((PHT_CAPABILITY_ELE)(network->bssht.bdHTCapBuf))->ChlWidth);
+ network->bssht.bdHT1R =
+ ((((struct HT_CAPABILITY_ELE *)
+ (network->bssht.bdHTCapBuf))->MCS[1])
+ == 0);
+
+ network->bssht.bdBandWidth =
+ (enum HT_CHANNEL_WIDTH)
+ (((struct HT_CAPABILITY_ELE *)
+ (network->bssht.bdHTCapBuf))->ChlWidth);
}
else{
network->bssht.bdSupportHT = false;
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index ccb449b..db59316 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -212,7 +212,7 @@ MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee)
u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
u8 rate;
if (pHTInfo->IOTAction & HT_IOT_ACT_MGNT_USE_CCK_6M)
@@ -884,7 +884,7 @@ static struct sk_buff* rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest)
u8 tmp_ht_cap_len = 0;
u8* tmp_ht_info_buf = NULL;
u8 tmp_ht_info_len = 0;
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
u8* tmp_generic_ie_buf = NULL;
u8 tmp_generic_ie_len = 0;
diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index fc3dafc..bdce929 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -317,8 +317,8 @@ 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;
- HT_CHANNEL_WIDTH bandwidth=0;
+ enum HT_EXTCHNL_OFFSET chan_offset = 0;
+ enum HT_CHANNEL_WIDTH bandwidth = 0;
int b40M = 0;
static int count = 0;
@@ -351,7 +351,7 @@ void rtllib_wx_sync_scan_wq(void *data)
if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) {
b40M = 1;
chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;
- bandwidth = (HT_CHANNEL_WIDTH)ieee->pHTInfo->bCurBW40MHz;
+ bandwidth = (enum HT_CHANNEL_WIDTH)ieee->pHTInfo->bCurBW40MHz;
RT_TRACE(COMP_DBG, "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);
}
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 0a59720..82ca245 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -289,7 +289,7 @@ rtllib_classify(struct sk_buff *skb, u8 bIsAmsdu)
#define SN_LESS(a, b) (((a-b)&0x800)!=0)
void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, cb_desc* tcb_desc)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
PTX_TS_RECORD pTxTs = NULL;
struct rtllib_hdr_1addr* hdr = (struct rtllib_hdr_1addr*)skb->data;
@@ -375,7 +375,7 @@ extern void rtllib_qurey_ShortPreambleMode(struct rtllib_device* ieee, cb_desc*
extern void
rtllib_query_HTCapShortGI(struct rtllib_device *ieee, cb_desc *tcb_desc)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
tcb_desc->bUseShortGI = false;
@@ -396,7 +396,7 @@ rtllib_query_HTCapShortGI(struct rtllib_device *ieee, cb_desc *tcb_desc)
void rtllib_query_BandwidthMode(struct rtllib_device* ieee, cb_desc *tcb_desc)
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
tcb_desc->bPacketBW = false;
@@ -444,7 +444,7 @@ void rtllib_query_protectionmode(struct rtllib_device* ieee, cb_desc* tcb_desc,
}
else
{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
+ struct RT_HIGH_THROUGHPUT *pHTInfo = ieee->pHTInfo;
while (true)
{
if (pHTInfo->IOTAction & HT_IOT_ACT_FORCED_CTS2SELF)
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index db4c568..a52d637 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -148,13 +148,15 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
if (network->mode >= IEEE_N_24G)
{
- PHT_CAPABILITY_ELE ht_cap = NULL;
+ struct HT_CAPABILITY_ELE *ht_cap = NULL;
bool is40M = false, isShortGI = false;
u8 max_mcs = 0;
if (!memcmp(network->bssht.bdHTCapBuf, EWC11NHTCap, 4))
- ht_cap = (PHT_CAPABILITY_ELE)&network->bssht.bdHTCapBuf[4];
+ ht_cap = (struct HT_CAPABILITY_ELE *)
+ &network->bssht.bdHTCapBuf[4];
else
- ht_cap = (PHT_CAPABILITY_ELE)&network->bssht.bdHTCapBuf[0];
+ ht_cap = (struct HT_CAPABILITY_ELE *)
+ &network->bssht.bdHTCapBuf[0];
is40M = (ht_cap->ChlWidth)?1:0;
isShortGI = (ht_cap->ChlWidth)?
((ht_cap->ShortGI40Mhz)?1:0):
--
1.7.3.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
