diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-18 21:34:19 -0400 |
---|---|---|
committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 01:56:09 -0400 |
commit | e92b71d571dfc08ae0ac792ffa463c0a601c32a5 (patch) | |
tree | a70f7c96ac02b4b8c717631ab82f65335b222d8c /drivers/staging/rtl8192e/rtl819x_HTProc.c | |
parent | 407e998e593d379a30e32e71d10e4f589404d0f2 (diff) |
staging: rtl8192e: Convert typedef HT_CAPABILITY_ELE to struct ht_capab_ele
Remove typedef from struct.
Rename struct.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Diffstat (limited to 'drivers/staging/rtl8192e/rtl819x_HTProc.c')
-rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HTProc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 3ac68917181..10cce89b10e 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c | |||
@@ -98,14 +98,14 @@ void HTDebugHTCapability(u8* CapIE, u8* TitleString ) | |||
98 | { | 98 | { |
99 | 99 | ||
100 | static u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33}; | 100 | static u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33}; |
101 | PHT_CAPABILITY_ELE pCapELE; | 101 | struct ht_capab_ele *pCapELE; |
102 | 102 | ||
103 | if (!memcmp(CapIE, EWC11NHTCap, sizeof(EWC11NHTCap))) | 103 | if (!memcmp(CapIE, EWC11NHTCap, sizeof(EWC11NHTCap))) |
104 | { | 104 | { |
105 | RTLLIB_DEBUG(RTLLIB_DL_HT, "EWC IE in %s()\n", __func__); | 105 | RTLLIB_DEBUG(RTLLIB_DL_HT, "EWC IE in %s()\n", __func__); |
106 | pCapELE = (PHT_CAPABILITY_ELE)(&CapIE[4]); | 106 | pCapELE = (struct ht_capab_ele *)(&CapIE[4]); |
107 | }else | 107 | }else |
108 | pCapELE = (PHT_CAPABILITY_ELE)(&CapIE[0]); | 108 | pCapELE = (struct ht_capab_ele *)(&CapIE[0]); |
109 | 109 | ||
110 | RTLLIB_DEBUG(RTLLIB_DL_HT, "<Log HT Capability>. Called by %s\n", TitleString ); | 110 | RTLLIB_DEBUG(RTLLIB_DL_HT, "<Log HT Capability>. Called by %s\n", TitleString ); |
111 | 111 | ||
@@ -190,7 +190,7 @@ bool IsHTHalfNmode40Bandwidth(struct rtllib_device* ieee) | |||
190 | retValue = false; | 190 | retValue = false; |
191 | else if (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) | 191 | else if (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) |
192 | retValue = false; | 192 | retValue = false; |
193 | else if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ChlWidth) | 193 | else if (((struct ht_capab_ele *)(pHTInfo->PeerHTCapBuf))->ChlWidth) |
194 | retValue = true; | 194 | retValue = true; |
195 | else | 195 | else |
196 | retValue = false; | 196 | retValue = false; |
@@ -209,14 +209,14 @@ bool IsHTHalfNmodeSGI(struct rtllib_device* ieee, bool is40MHz) | |||
209 | retValue = false; | 209 | retValue = false; |
210 | else if (is40MHz) | 210 | else if (is40MHz) |
211 | { | 211 | { |
212 | if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ShortGI40Mhz) | 212 | if (((struct ht_capab_ele *)(pHTInfo->PeerHTCapBuf))->ShortGI40Mhz) |
213 | retValue = true; | 213 | retValue = true; |
214 | else | 214 | else |
215 | retValue = false; | 215 | retValue = false; |
216 | } | 216 | } |
217 | else | 217 | else |
218 | { | 218 | { |
219 | if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ShortGI20Mhz) | 219 | if (((struct ht_capab_ele *)(pHTInfo->PeerHTCapBuf))->ShortGI20Mhz) |
220 | retValue = true; | 220 | retValue = true; |
221 | else | 221 | else |
222 | retValue = false; | 222 | retValue = false; |
@@ -585,7 +585,7 @@ void HTResetIOTSetting( | |||
585 | void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* len, u8 IsEncrypt, bool bAssoc) | 585 | void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* len, u8 IsEncrypt, bool bAssoc) |
586 | { | 586 | { |
587 | struct rt_hi_throughput *pHT = ieee->pHTInfo; | 587 | struct rt_hi_throughput *pHT = ieee->pHTInfo; |
588 | PHT_CAPABILITY_ELE pCapELE = NULL; | 588 | struct ht_capab_ele *pCapELE = NULL; |
589 | 589 | ||
590 | if ((posHTCap == NULL) || (pHT == NULL)) | 590 | if ((posHTCap == NULL) || (pHT == NULL)) |
591 | { | 591 | { |
@@ -598,11 +598,11 @@ void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* | |||
598 | { | 598 | { |
599 | u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33}; | 599 | u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33}; |
600 | memcpy(posHTCap, EWC11NHTCap, sizeof(EWC11NHTCap)); | 600 | memcpy(posHTCap, EWC11NHTCap, sizeof(EWC11NHTCap)); |
601 | pCapELE = (PHT_CAPABILITY_ELE)&(posHTCap[4]); | 601 | pCapELE = (struct ht_capab_ele *)&(posHTCap[4]); |
602 | *len = 30 + 2; | 602 | *len = 30 + 2; |
603 | }else | 603 | }else |
604 | { | 604 | { |
605 | pCapELE = (PHT_CAPABILITY_ELE)posHTCap; | 605 | pCapELE = (struct ht_capab_ele *)posHTCap; |
606 | *len = 26 + 2; | 606 | *len = 26 + 2; |
607 | } | 607 | } |
608 | 608 | ||
@@ -835,7 +835,7 @@ void HTSetConnectBwMode(struct rtllib_device* ieee, HT_CHANNEL_WIDTH Bandwidth, | |||
835 | void HTOnAssocRsp(struct rtllib_device *ieee) | 835 | void HTOnAssocRsp(struct rtllib_device *ieee) |
836 | { | 836 | { |
837 | struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; | 837 | struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; |
838 | PHT_CAPABILITY_ELE pPeerHTCap = NULL; | 838 | struct ht_capab_ele *pPeerHTCap = NULL; |
839 | struct ht_info_ele *pPeerHTInfo = NULL; | 839 | struct ht_info_ele *pPeerHTInfo = NULL; |
840 | u16 nMaxAMSDUSize = 0; | 840 | u16 nMaxAMSDUSize = 0; |
841 | u8* pMcsFilter = NULL; | 841 | u8* pMcsFilter = NULL; |
@@ -851,16 +851,16 @@ void HTOnAssocRsp(struct rtllib_device *ieee) | |||
851 | RTLLIB_DEBUG(RTLLIB_DL_HT, "===> HTOnAssocRsp_wq(): HT_ENABLE\n"); | 851 | RTLLIB_DEBUG(RTLLIB_DL_HT, "===> HTOnAssocRsp_wq(): HT_ENABLE\n"); |
852 | 852 | ||
853 | if (!memcmp(pHTInfo->PeerHTCapBuf,EWC11NHTCap, sizeof(EWC11NHTCap))) | 853 | if (!memcmp(pHTInfo->PeerHTCapBuf,EWC11NHTCap, sizeof(EWC11NHTCap))) |
854 | pPeerHTCap = (PHT_CAPABILITY_ELE)(&pHTInfo->PeerHTCapBuf[4]); | 854 | pPeerHTCap = (struct ht_capab_ele *)(&pHTInfo->PeerHTCapBuf[4]); |
855 | else | 855 | else |
856 | pPeerHTCap = (PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf); | 856 | pPeerHTCap = (struct ht_capab_ele *)(pHTInfo->PeerHTCapBuf); |
857 | 857 | ||
858 | if (!memcmp(pHTInfo->PeerHTInfoBuf, EWC11NHTInfo, sizeof(EWC11NHTInfo))) | 858 | if (!memcmp(pHTInfo->PeerHTInfoBuf, EWC11NHTInfo, sizeof(EWC11NHTInfo))) |
859 | pPeerHTInfo = (struct ht_info_ele *)(&pHTInfo->PeerHTInfoBuf[4]); | 859 | pPeerHTInfo = (struct ht_info_ele *)(&pHTInfo->PeerHTInfoBuf[4]); |
860 | else | 860 | else |
861 | pPeerHTInfo = (struct ht_info_ele *)(pHTInfo->PeerHTInfoBuf); | 861 | pPeerHTInfo = (struct ht_info_ele *)(pHTInfo->PeerHTInfoBuf); |
862 | 862 | ||
863 | RTLLIB_DEBUG_DATA(RTLLIB_DL_DATA|RTLLIB_DL_HT, pPeerHTCap, sizeof(HT_CAPABILITY_ELE)); | 863 | RTLLIB_DEBUG_DATA(RTLLIB_DL_DATA|RTLLIB_DL_HT, pPeerHTCap, sizeof(struct ht_capab_ele)); |
864 | HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset)); | 864 | HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset)); |
865 | pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false); | 865 | pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false); |
866 | 866 | ||