diff --git a/[refs] b/[refs] index 0c612671ae28..03fa52423d30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58b32cba16ecf2ffeb28a87b20d0a83c6a8ff90a +refs/heads/master: a95c69cfe44d96489777f9eda8c2005963730bef diff --git a/trunk/drivers/staging/winbond/core.h b/trunk/drivers/staging/winbond/core.h index 42c986826f3e..7d4bd5e8f69b 100644 --- a/trunk/drivers/staging/winbond/core.h +++ b/trunk/drivers/staging/winbond/core.h @@ -18,7 +18,7 @@ struct wbsoft_priv { MLME_FRAME sMlmeFrame; // connect to peerSTA parameters - MTO_PARAMETERS sMtoPara; // MTO_struct ... + struct wb35_mto_params sMtoPara; // MTO_struct ... struct hw_data sHwData; //For HAL struct wb35_mds Mds; diff --git a/trunk/drivers/staging/winbond/mto.h b/trunk/drivers/staging/winbond/mto.h index 5990ba35644d..e6d2ccb0a03d 100644 --- a/trunk/drivers/staging/winbond/mto.h +++ b/trunk/drivers/staging/winbond/mto.h @@ -50,8 +50,7 @@ typedef enum { // // Defines the parameters used in the MAC Throughput Optimization algorithm //============================================================================ -typedef struct _MTO_PARAMETERS -{ +struct wb35_mto_params { u8 Th_Fixant; u8 Th_Cnt; u8 Th_SQ3; @@ -130,7 +129,7 @@ typedef struct _MTO_PARAMETERS s32 RSSI_high; s32 RSSI_low; -} MTO_PARAMETERS, *PMTO_PARAMETERS; +}; #define MTO_DATA() (adapter->sMtoPara)