rtl8188eu: Convert typedef statements in include/rtw_mlme.h

2
This commit is contained in:
Larry Finger 2013-07-26 16:37:24 -05:00
parent 9eeabb2600
commit ed7a8186fe
5 changed files with 19 additions and 20 deletions

View file

@ -1176,7 +1176,7 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
*
* Return _SUCCESS or _FAIL
*/
int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode)
int rtw_set_scan_mode(_adapter *adapter, enum rt_scan_type scan_mode)
{
if (scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE)
return _FAIL;

View file

@ -7197,7 +7197,7 @@ bool IsLegal5GChannel(PADAPTER Adapter, u8 channel)
void site_survey(_adapter *padapter)
{
unsigned char survey_channel = 0, val8;
RT_SCAN_TYPE ScanType = SCAN_PASSIVE;
enum rt_scan_type ScanType = SCAN_PASSIVE;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u32 initialgain = 0;

View file

@ -40,7 +40,7 @@ u8 rtw_set_802_11_remove_key(_adapter * padapter, struct ndis_802_11_remove_key
u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid);
u16 rtw_get_cur_max_rate(_adapter *adapter);
int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode);
int rtw_set_scan_mode(_adapter *adapter, enum rt_scan_type scan_mode);
int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan);
int rtw_set_country(_adapter *adapter, const char *country_code);
int rtw_change_ifname(_adapter *padapter, const char *ifname);

View file

@ -76,12 +76,11 @@ enum dot11AuthAlgrthmNum {
};
// Scan type including active and passive scan.
typedef enum _RT_SCAN_TYPE
{
enum rt_scan_type {
SCAN_PASSIVE,
SCAN_ACTIVE,
SCAN_MIX,
}RT_SCAN_TYPE, *PRT_SCAN_TYPE;
};
enum SCAN_RESULT_TYPE
{
@ -117,17 +116,17 @@ struct sitesurvey_ctrl {
struct timer_list sitesurvey_ctrl_timer;
};
typedef struct _RT_LINK_DETECT_T{
u32 NumTxOkInPeriod;
u32 NumRxOkInPeriod;
u32 NumRxUnicastOkInPeriod;
bool bBusyTraffic;
bool bTxBusyTraffic;
bool bRxBusyTraffic;
bool bHigherBusyTraffic; // For interrupt migration purpose.
bool bHigherBusyRxTraffic; // We may disable Tx interrupt according as Rx traffic.
bool bHigherBusyTxTraffic; // We may disable Tx interrupt according as Tx traffic.
}RT_LINK_DETECT_T, *PRT_LINK_DETECT_T;
struct rt_link_detect {
u32 NumTxOkInPeriod;
u32 NumRxOkInPeriod;
u32 NumRxUnicastOkInPeriod;
bool bBusyTraffic;
bool bTxBusyTraffic;
bool bRxBusyTraffic;
bool bHigherBusyTraffic; // For interrupt migration purpose.
bool bHigherBusyRxTraffic; // We may disable Tx interrupt according as Rx traffic.
bool bHigherBusyTxTraffic; // We may disable Tx interrupt according as Tx traffic.
};
struct profile_info {
u8 ssidlen;
@ -339,13 +338,13 @@ struct mlme_priv {
#endif
RT_LINK_DETECT_T LinkDetectInfo;
struct rt_link_detect LinkDetectInfo;
struct timer_list dynamic_chk_timer; //dynamic/periodic check timer
u8 key_mask; //use for ips to set wep key after ips_leave
u8 acm_mask; // for wmm acm mask
u8 ChannelPlan;
RT_SCAN_TYPE scan_mode; // active: 1, passive: 0
enum rt_scan_type scan_mode; // active: 1, passive: 0
//u8 probereq_wpsie[MAX_WPS_IE_LEN];//added in probe req
//int probereq_wpsie_len;

View file

@ -377,7 +377,7 @@ struct mlme_ext_info {
// The channel information about this channel including joining, scanning, and power constraints.
struct rt_channel_info {
u8 ChannelNum; // The channel number.
RT_SCAN_TYPE ScanType; // Scan type such as passive or active scan.
enum rt_scan_type ScanType; // Scan type such as passive or active scan.
u32 rx_count;
};