From: Larry Finger Date: Tue, 19 Jul 2011 01:26:49 +0000 (-0500) Subject: staging: rtl8192e: Convert typedef BSS_HT to struct bss_ht X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a15e76ad063248ec1d06baee423881e7aa73066b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging: rtl8192e: Convert typedef BSS_HT to struct bss_ht Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger --- diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index c3eaea4931b5..d327a52a9d6a 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -334,7 +334,7 @@ struct rt_htinfo_sta_entry { -typedef struct _BSS_HT{ +struct bss_ht { u8 bdSupportHT; @@ -350,7 +350,7 @@ typedef struct _BSS_HT{ u8 bdRT2RTLongSlotTime; u8 RT2RT_HT_Mode; u8 bdHT1R; -} __attribute__ ((packed)) BSS_HT, *PBSS_HT; +}; typedef struct _MIMO_RSSI{ u32 EnableAntenna; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 94ec155c7ba4..c319ad5c1bda 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -990,7 +990,7 @@ void HTInitializeHTInfo(struct rtllib_device* ieee) RegHTSuppRateSets[4] = 0x01; } } -void HTInitializeBssDesc(PBSS_HT pBssHT) +void HTInitializeBssDesc(struct bss_ht *pBssHT) { pBssHT->bdSupportHT = false; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 40e20db37955..4b8bd0976384 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1688,7 +1688,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; @@ -2898,7 +2898,7 @@ extern void HTConstructInfoElement(struct rtllib_device* ieee, u8* posHTInfo, u8 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);