From bb9a7b3f239c0a7ab9b05690b8fa7df8eba16dfe Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 19:22:37 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef RT_HT_CAPBILITY to enum rt_ht_capability Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl819x_HT.h | 4 ++-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 396e9ed2451..108b27cc95c 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -464,13 +464,13 @@ enum ht_iot_rafunc { HT_IOT_RAFUNC_TX_AMSDU = 0x02, }; -typedef enum _RT_HT_CAPBILITY{ +enum rt_ht_capability { RT_HT_CAP_USE_TURBO_AGGR = 0x01, RT_HT_CAP_USE_LONG_PREAMBLE = 0x02, RT_HT_CAP_USE_AMPDU = 0x04, RT_HT_CAP_USE_WOW = 0x8, RT_HT_CAP_USE_SOFTAP = 0x10, RT_HT_CAP_USE_92SE = 0x20, -} RT_HT_CAPBILITY, *PRT_HT_CAPBILITY; +}; #endif diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index ed7a6b44591..825b90805b4 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -977,7 +977,7 @@ void HTInitializeHTInfo(struct rtllib_device* ieee) pHTInfo->bCurrentRT2RTAggregation = false; pHTInfo->bCurrentRT2RTLongSlotTime = false; - pHTInfo->RT2RT_HT_Mode = (RT_HT_CAPBILITY)0; + pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability)0; pHTInfo->IOTPeer = 0; pHTInfo->IOTAction = 0; @@ -1003,7 +1003,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT) pBssHT->bdRT2RTAggregation = false; pBssHT->bdRT2RTLongSlotTime = false; - pBssHT->RT2RT_HT_Mode = (RT_HT_CAPBILITY)0; + pBssHT->RT2RT_HT_Mode = (enum rt_ht_capability)0; } void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_network * pNetwork) @@ -1034,7 +1034,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_net { pHTInfo->bCurrentRT2RTAggregation = false; pHTInfo->bCurrentRT2RTLongSlotTime = false; - pHTInfo->RT2RT_HT_Mode = (RT_HT_CAPBILITY)0; + pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability)0; } HTIOTPeerDetermine(ieee); @@ -1067,7 +1067,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_net pHTInfo->bCurrentHTSupport = false; pHTInfo->bCurrentRT2RTAggregation = false; pHTInfo->bCurrentRT2RTLongSlotTime = false; - pHTInfo->RT2RT_HT_Mode = (RT_HT_CAPBILITY)0; + pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability)0; pHTInfo->IOTAction = 0; pHTInfo->IOTRaFunc = 0;