diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-18 21:57:13 -0500 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 01:17:14 -0500 |
| commit | 8310b6c05c65dfe699dd62be5d71c246ddaefd96 (patch) | |
| tree | 54182be6b1c639fff84d4ce5310175f2583a6cfe | |
| parent | 95ce5fc94759fe4c17c9c3afb1cf897045736fa1 (diff) | |
| download | op-kernel-dev-8310b6c05c65dfe699dd62be5d71c246ddaefd96.zip op-kernel-dev-8310b6c05c65dfe699dd62be5d71c246ddaefd96.tar.gz | |
staging: rtl8192e: Convert typedef OCTET_STRING to struct octet_string
Remove typedef from struct.
Rename struct.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_Qos.h | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib.h | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_softmac.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h index e9eea5a..1b889f2 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -103,10 +103,10 @@ struct wmm_tspec { TSPEC_BODY Body; }; -typedef struct _OCTET_STRING{ +struct octet_string { u8 *Octet; u16 Length; -}OCTET_STRING, *POCTET_STRING; +};//, *struct octet_string *; #define MAX_WMMELE_LENGTH 64 typedef u32 QOS_MODE, *PQOS_MODE; @@ -356,7 +356,7 @@ struct bss_qos { QOS_MODE bdQoSMode; u8 bdWMMIEBuf[MAX_WMMELE_LENGTH]; - OCTET_STRING bdWMMIE; + struct octet_string bdWMMIE; QOS_ELE_SUBTYPE EleSubType; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index ffa3fe5..9a9f3d3 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1882,14 +1882,14 @@ typedef struct _RT_POWER_SAVE_CONTROL bool bTmpFilterHiddenAP; bool bTmpUpdateParms; u8 tmpSsidBuf[33]; - OCTET_STRING tmpSsid2Scan; + struct octet_string tmpSsid2Scan; bool bTmpSsid2Scan; u8 tmpNetworkType; u8 tmpChannelNumber; u16 tmpBcnPeriod; u8 tmpDtimPeriod; u16 tmpmCap; - OCTET_STRING tmpSuppRateSet; + struct octet_string tmpSuppRateSet; u8 tmpSuppRateBuf[MAX_NUM_RATES]; bool bTmpSuppRate; IbssParms tmpIbpm; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 7930a96..8cf42f0 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1351,7 +1351,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru { static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; u8 CcxAironetBuf[30]; - OCTET_STRING osCcxAironetIE; + struct octet_string osCcxAironetIE; memset(CcxAironetBuf, 0,30); osCcxAironetIE.Octet = CcxAironetBuf; @@ -1369,7 +1369,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru if (beacon->bCcxRmEnable) { static u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01, 0x00}; - OCTET_STRING osCcxRmCap; + struct octet_string osCcxRmCap; osCcxRmCap.Octet = CcxRmCapBuf; osCcxRmCap.Length = sizeof(CcxRmCapBuf); @@ -1383,7 +1383,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru if ( beacon->BssCcxVerNumber >= 2 ) { u8 CcxVerNumBuf[] = {0x00, 0x40, 0x96, 0x03, 0x00}; - OCTET_STRING osCcxVerNum; + struct octet_string osCcxVerNum; CcxVerNumBuf[4] = beacon->BssCcxVerNumber; osCcxVerNum.Octet = CcxVerNumBuf; osCcxVerNum.Length = sizeof(CcxVerNumBuf); |
