diff --git a/[refs] b/[refs] index 92d878b6e13b..aab8537e151e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44a4004670a47135fa4dcc0473d3d28c8fb3e922 +refs/heads/master: a33be1e842d6fef31cc5e88bc92541552a448286 diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h index af5c627941a3..1bf1016f77b6 100644 --- a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -387,14 +387,14 @@ union aci_aifsn { }f; }; -typedef union _ECW{ +union ecw { u8 charData; struct { u8 ECWmin:4; u8 ECWmax:4; }f; -}ECW, *PECW; +}; typedef union _AC_PARAM{ u32 longData; @@ -403,7 +403,7 @@ typedef union _AC_PARAM{ struct { union aci_aifsn AciAifsn; - ECW Ecw; + union ecw Ecw; u16 TXOPLimit; }f; }AC_PARAM, *PAC_PARAM;