Commit 8310b6c0 authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Convert typedef OCTET_STRING to struct octet_string

Remove typedef from struct.
Rename struct.
Rename uses.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 95ce5fc9
...@@ -103,10 +103,10 @@ struct wmm_tspec { ...@@ -103,10 +103,10 @@ struct wmm_tspec {
TSPEC_BODY Body; TSPEC_BODY Body;
}; };
typedef struct _OCTET_STRING{ struct octet_string {
u8 *Octet; u8 *Octet;
u16 Length; u16 Length;
}OCTET_STRING, *POCTET_STRING; };//, *struct octet_string *;
#define MAX_WMMELE_LENGTH 64 #define MAX_WMMELE_LENGTH 64
typedef u32 QOS_MODE, *PQOS_MODE; typedef u32 QOS_MODE, *PQOS_MODE;
...@@ -356,7 +356,7 @@ struct bss_qos { ...@@ -356,7 +356,7 @@ struct bss_qos {
QOS_MODE bdQoSMode; QOS_MODE bdQoSMode;
u8 bdWMMIEBuf[MAX_WMMELE_LENGTH]; u8 bdWMMIEBuf[MAX_WMMELE_LENGTH];
OCTET_STRING bdWMMIE; struct octet_string bdWMMIE;
QOS_ELE_SUBTYPE EleSubType; QOS_ELE_SUBTYPE EleSubType;
......
...@@ -1882,14 +1882,14 @@ typedef struct _RT_POWER_SAVE_CONTROL ...@@ -1882,14 +1882,14 @@ typedef struct _RT_POWER_SAVE_CONTROL
bool bTmpFilterHiddenAP; bool bTmpFilterHiddenAP;
bool bTmpUpdateParms; bool bTmpUpdateParms;
u8 tmpSsidBuf[33]; u8 tmpSsidBuf[33];
OCTET_STRING tmpSsid2Scan; struct octet_string tmpSsid2Scan;
bool bTmpSsid2Scan; bool bTmpSsid2Scan;
u8 tmpNetworkType; u8 tmpNetworkType;
u8 tmpChannelNumber; u8 tmpChannelNumber;
u16 tmpBcnPeriod; u16 tmpBcnPeriod;
u8 tmpDtimPeriod; u8 tmpDtimPeriod;
u16 tmpmCap; u16 tmpmCap;
OCTET_STRING tmpSuppRateSet; struct octet_string tmpSuppRateSet;
u8 tmpSuppRateBuf[MAX_NUM_RATES]; u8 tmpSuppRateBuf[MAX_NUM_RATES];
bool bTmpSuppRate; bool bTmpSuppRate;
IbssParms tmpIbpm; IbssParms tmpIbpm;
......
...@@ -1351,7 +1351,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru ...@@ -1351,7 +1351,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru
{ {
static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; static u8 AironetIeOui[] = {0x00, 0x01, 0x66};
u8 CcxAironetBuf[30]; u8 CcxAironetBuf[30];
OCTET_STRING osCcxAironetIE; struct octet_string osCcxAironetIE;
memset(CcxAironetBuf, 0,30); memset(CcxAironetBuf, 0,30);
osCcxAironetIE.Octet = CcxAironetBuf; osCcxAironetIE.Octet = CcxAironetBuf;
...@@ -1369,7 +1369,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru ...@@ -1369,7 +1369,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru
if (beacon->bCcxRmEnable) if (beacon->bCcxRmEnable)
{ {
static u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01, 0x00}; static u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01, 0x00};
OCTET_STRING osCcxRmCap; struct octet_string osCcxRmCap;
osCcxRmCap.Octet = CcxRmCapBuf; osCcxRmCap.Octet = CcxRmCapBuf;
osCcxRmCap.Length = sizeof(CcxRmCapBuf); osCcxRmCap.Length = sizeof(CcxRmCapBuf);
...@@ -1383,7 +1383,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru ...@@ -1383,7 +1383,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru
if ( beacon->BssCcxVerNumber >= 2 ) if ( beacon->BssCcxVerNumber >= 2 )
{ {
u8 CcxVerNumBuf[] = {0x00, 0x40, 0x96, 0x03, 0x00}; u8 CcxVerNumBuf[] = {0x00, 0x40, 0x96, 0x03, 0x00};
OCTET_STRING osCcxVerNum; struct octet_string osCcxVerNum;
CcxVerNumBuf[4] = beacon->BssCcxVerNumber; CcxVerNumBuf[4] = beacon->BssCcxVerNumber;
osCcxVerNum.Octet = CcxVerNumBuf; osCcxVerNum.Octet = CcxVerNumBuf;
osCcxVerNum.Length = sizeof(CcxVerNumBuf); osCcxVerNum.Length = sizeof(CcxVerNumBuf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment