diff --git a/[refs] b/[refs] index a17047538e39..14daab9dd5c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8304cc64dc242f4b410899256c929b9a93108a92 +refs/heads/master: f6ce577e381e248fbcdad0d9d7e51e5337b6a6a0 diff --git a/trunk/drivers/staging/rtl8192e/rtllib.h b/trunk/drivers/staging/rtl8192e/rtllib.h index 8afe29589c4a..b1e19cdaa04b 100644 --- a/trunk/drivers/staging/rtl8192e/rtllib.h +++ b/trunk/drivers/staging/rtl8192e/rtllib.h @@ -1812,12 +1812,12 @@ enum ips_callback_function { IPS_CALLBACK_JOIN_REQUEST = 2, }; -typedef enum _RT_JOIN_ACTION{ +enum rt_join_action { RT_JOIN_INFRA = 1, RT_JOIN_IBSS = 2, RT_START_IBSS = 3, RT_NO_ACTION = 4, -} RT_JOIN_ACTION; +}; struct ibss_parms { u16 atimWin; @@ -1866,7 +1866,7 @@ struct rt_pwr_save_ctrl { enum ips_callback_function ReturnPoint; bool bTmpBssDesc; - RT_JOIN_ACTION tmpJoinAction; + enum rt_join_action tmpJoinAction; struct rtllib_network tmpBssDesc; bool bTmpScanOnly;