diff --git a/[refs] b/[refs] index 7e7caa006e7c..aa6af9a74f44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ce600451d9d5543cba5b4c0478ecd02ffd3e399 +refs/heads/master: 7152e7ec339bf187109d559089712f882291fb98 diff --git a/trunk/drivers/staging/rtl8192e/rtllib.h b/trunk/drivers/staging/rtl8192e/rtllib.h index 1f405cdccc52..2bf090c41c1f 100644 --- a/trunk/drivers/staging/rtl8192e/rtllib.h +++ b/trunk/drivers/staging/rtl8192e/rtllib.h @@ -1824,9 +1824,9 @@ typedef enum _RT_JOIN_ACTION{ RT_NO_ACTION = 4, }RT_JOIN_ACTION; -typedef struct _IbssParms{ +struct ibss_parms { u16 atimWin; -}IbssParms, *PIbssParms; +};//, *struct ibss_parms *; #define MAX_NUM_RATES 264 typedef enum _RT_RF_POWER_STATE @@ -1889,7 +1889,7 @@ struct rt_pwr_save_ctrl { struct octet_string tmpSuppRateSet; u8 tmpSuppRateBuf[MAX_NUM_RATES]; bool bTmpSuppRate; - IbssParms tmpIbpm; + struct ibss_parms tmpIbpm; bool bTmpIbpm; bool bLeisurePs;