diff --git a/[refs] b/[refs] index c78b2c41a98f..c28ea1e08b03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b678bd1ff579f9e6233911fe5ce5fce31c5242e0 +refs/heads/master: c1c5d0741697637422197ee8926e856fbda091c4 diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h index 459753fbe7cf..0b48dc76c499 100644 --- a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h @@ -70,12 +70,12 @@ enum ht_extchnl_offset { HT_EXTCHNL_OFFSET_LOWER = 3, }; -typedef enum _CHNLOP{ +enum chnl_op { CHNLOP_NONE = 0, CHNLOP_SCAN = 1, CHNLOP_SWBW = 2, CHNLOP_SWCHNL = 3, -} CHNLOP, *PCHNLOP; +}; #define CHHLOP_IN_PROGRESS(_pHTInfo) \ ((_pHTInfo)->ChnlOp > CHNLOP_NONE) ? true : false @@ -270,7 +270,7 @@ struct rt_hi_throughput { u8 PeerBandwidth; u8 bSwBwInProgress; - CHNLOP ChnlOp; + enum chnl_op ChnlOp; u8 SwBwStep; u8 bRegRT2RTAggregation;