diff options
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index 326a1e47bade..3cfeac0d7214 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -1543,14 +1543,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/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index ca3a35b8ac07..706b4419e643 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -1063,7 +1063,7 @@ ieee80211_association_req(struct ieee80211_network *beacon, if (beacon->bCkipSupported) { static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; // "4500-client" u8 CcxAironetBuf[30]; - OCTET_STRING osCcxAironetIE; + struct octet_string osCcxAironetIE; memset(CcxAironetBuf, 0, 30); osCcxAironetIE.Octet = CcxAironetBuf; @@ -1087,7 +1087,7 @@ ieee80211_association_req(struct ieee80211_network *beacon, 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); @@ -1100,7 +1100,7 @@ ieee80211_association_req(struct ieee80211_network *beacon, 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); diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h index fb055a848d59..531a3e22e799 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h @@ -72,10 +72,10 @@ struct tspec_body { //---------------------------------------------------------------------------- // 802.11 Management frame Status Code field //---------------------------------------------------------------------------- -typedef struct _OCTET_STRING { +struct octet_string { u8 *Octet; u16 Length; -} OCTET_STRING, *POCTET_STRING; +}; //Added by joseph //UP Mapping to AC, using in MgntQuery_SequenceNumber() and maybe for DSCP |