diff --git a/[refs] b/[refs] index 342a2ed90c11..a4cef18cb462 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2eff5c3bf87256817ad7e2495a4e9226dbec0e8 +refs/heads/master: d1936afc52d81f84cb5f2b896094dbd9a0f40479 diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h index 175c8184c8f4..56c82fd2abb8 100644 --- a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h @@ -206,11 +206,11 @@ enum ht_spec_ver { HT_SPEC_VER_EWC = 1, }; -typedef enum _HT_AGGRE_MODE_E{ +enum ht_aggre_mode { HT_AGG_AUTO = 0, HT_AGG_FORCE_ENABLE = 1, HT_AGG_FORCE_DISABLE = 2, -} HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E; +}; struct rt_hi_throughput { @@ -251,11 +251,11 @@ struct rt_hi_throughput { u8 MPDU_Density; u8 CurrentMPDUDensity; - HT_AGGRE_MODE_E ForcedAMPDUMode; + enum ht_aggre_mode ForcedAMPDUMode; u8 ForcedAMPDUFactor; u8 ForcedMPDUDensity; - HT_AGGRE_MODE_E ForcedAMSDUMode; + enum ht_aggre_mode ForcedAMSDUMode; u16 ForcedAMSDUMaxSize; u8 bForcedShortGI;