skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Replace typedef for WLAN_BSSID_EX

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-06 18:26:23 -06:00
parent 5d615fab61
commit 4bf02bb7d8
24 changed files with 138 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/drv_types.h
View file

@ -131,7 +131,7 @@ struct registry_priv
u8 uapsd_acvi_en;
u8 uapsd_acvo_en;
WLAN_BSSID_EX dev_network;
struct wlan_bssid_ex dev_network;
u8 ht_enable;
u8 cbw40_enable;
@ -192,8 +192,8 @@ struct registry_priv
//For registry parameters
#define RGTRY_OFT(field) ((ULONG)FIELD_OFFSET(struct registry_priv,field))
#define RGTRY_SZ(field) sizeof(((struct registry_priv*) 0)->field)
#define BSSID_OFT(field) ((ULONG)FIELD_OFFSET(WLAN_BSSID_EX,field))
#define BSSID_SZ(field) sizeof(((PWLAN_BSSID_EX) 0)->field)
#define BSSID_OFT(field) ((ULONG)FIELD_OFFSET(struct wlan_bssid_ex,field))
#define BSSID_SZ(field) sizeof(((struct wlan_bssid_ex *) 0)->field)
#define is_primary_adapter(adapter) (1)
#define GET_PRIMARY_ADAPTER(padapter) (((struct adapter *)padapter)->dvobj->if1)

4
include/hal_intf.h
View file

@ -209,7 +209,7 @@ struct hal_ops {
void (*cancel_thread)(struct adapter *padapter);
u8 (*AntDivBeforeLinkHandler)(struct adapter *padapter);
void (*AntDivCompareHandler)(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
void (*AntDivCompareHandler)(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
u8 (*interface_ps_func)(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val);
s32 (*hal_xmit)(struct adapter *padapter, struct xmit_frame *pxmitframe);
@ -402,7 +402,7 @@ void rtw_hal_set_chan(struct adapter *padapter, u8 channel);
void rtw_hal_dm_watchdog(struct adapter *padapter);
u8 rtw_hal_antdiv_before_linked(struct adapter *padapter);
void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
#ifdef CONFIG_HOSTAPD_MLME
s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt);

2
include/ieee80211.h
View file

@ -1279,7 +1279,7 @@ u8 *rtw_get_p2p_ie_from_scan_queue(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_
u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr, u32 *len_attr);
u8 *rtw_get_p2p_attr_content(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_content, uint *len_content);
u32 rtw_set_p2p_attr_content(u8 *pbuf, u8 attr_id, u16 attr_len, u8 *pdata_attr);
void rtw_WLAN_BSSID_EX_remove_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id);
void rtw_wlan_bssid_ex_remove_p2p_attr(struct wlan_bssid_ex *bss_ex, u8 attr_id);
#endif
#ifdef CONFIG_P2P

2
include/rtl8188e_dm.h
View file

@ -59,7 +59,7 @@ void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter);
void rtl8188e_InitHalDm(IN struct adapter *Adapter);
void rtl8188e_HalDmWatchDog(IN struct adapter *Adapter);
void AntDivCompare8188E(struct adapter *Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
void AntDivCompare8188E(struct adapter *Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
u8 AntDivBeforeLink8188E(struct adapter *Adapter );
#endif

4
include/rtw_ap.h
View file

@ -32,8 +32,8 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *
void init_mlme_ap_info(struct adapter *padapter);
void free_mlme_ap_info(struct adapter *padapter);
void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len);
void rtw_remove_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index);
void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len);
void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index);
void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx);
void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level);
void expire_timeout_chk(struct adapter *padapter);

6
include/rtw_cmd.h
View file

@ -218,7 +218,7 @@ Command Event Mode
*/
struct joinbss_parm {
WLAN_BSSID_EX network;
struct wlan_bssid_ex network;
};
/*
@ -241,7 +241,7 @@ Notes: To create a BSS
Command Mode
*/
struct createbss_parm {
WLAN_BSSID_EX network;
struct wlan_bssid_ex network;
};
/*
@ -549,7 +549,7 @@ struct getrfintfs_parm {
struct Tx_Beacon_param
{
WLAN_BSSID_EX network;
struct wlan_bssid_ex network;
};
/*

4
include/rtw_event.h
View file

@ -39,7 +39,7 @@ Used to report a bss has been scanned
*/
struct survey_event {
WLAN_BSSID_EX bss;
struct wlan_bssid_ex bss;
};
/*
@ -138,7 +138,7 @@ struct c2hevent_queue {
struct network_queue {
volatile int head;
volatile int tail;
WLAN_BSSID_EX networks[NETWORK_QUEUE_SZ];
struct wlan_bssid_ex networks[NETWORK_QUEUE_SZ];
};

6
include/rtw_mlme.h
View file

@ -663,8 +663,8 @@ __inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint v
spin_unlock_bh(&pmlmepriv->lock);
}
extern u16 rtw_get_capability(WLAN_BSSID_EX *bss);
extern void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target);
extern u16 rtw_get_capability(struct wlan_bssid_ex *bss);
extern void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target);
extern void rtw_disconnect_hdl_under_linked(struct adapter* adapter, struct sta_info *psta, u8 free_assoc);
extern void rtw_generate_random_ibss(u8 *pibss);
extern struct wlan_network* rtw_find_network(_queue *scanned_queue, u8 *addr);
@ -734,7 +734,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len);
void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitframe);
int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork);
int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature);
int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feature);
void _rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network);
void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network);

10
include/rtw_mlme_ext.h
View file

@ -389,7 +389,7 @@ struct mlme_ext_info {
struct WMM_para_element WMM_param;
struct HT_caps_element HT_caps;
struct HT_info_element HT_info;
WLAN_BSSID_EX network;//join network or bss_network, if in ap mode, it is the same to cur_network.network
struct wlan_bssid_ex network;//join network or bss_network, if in ap mode, it is the same to cur_network.network
struct FW_Sta_Info FW_sta_info[NUM_STA];
#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE
@ -556,12 +556,12 @@ void flush_all_cam_entry(struct adapter *padapter);
bool IsLegal5GChannel(struct adapter *Adapter, u8 channel);
void site_survey(struct adapter *padapter);
u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid);
void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, struct adapter * padapter, bool update_ie);
u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, struct wlan_bssid_ex *bssid);
void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, struct adapter * padapter, bool update_ie);
int get_bsstype(unsigned short capability);
u8* get_my_bssid(WLAN_BSSID_EX *pnetwork);
u16 get_beacon_interval(WLAN_BSSID_EX *bss);
u8* get_my_bssid(struct wlan_bssid_ex *pnetwork);
u16 get_beacon_interval(struct wlan_bssid_ex *bss);
int is_client_associated_to_ap(struct adapter *padapter);
int is_client_associated_to_ibss(struct adapter *padapter);

2
include/rtw_security.h
View file

@ -174,7 +174,7 @@ struct security_priv
u32 ndisauthtype; // NDIS_802_11_AUTHENTICATION_MODE
u32 ndisencryptstatus; // NDIS_802_11_ENCRYPTION_STATUS
WLAN_BSSID_EX sec_bss; //for joinbss (h2c buffer) usage
struct wlan_bssid_ex sec_bss; //for joinbss (h2c buffer) usage
NDIS_802_11_WEP ndiswep;

15
include/wlan_bssdef.h
View file

@ -292,10 +292,9 @@ typedef struct _WLAN_BCN_INFO
}WLAN_BCN_INFO,*PWLAN_BCN_INFO;
/* temporally add #pragma pack for structure alignment issue of
* WLAN_BSSID_EX and get_wlan_bssid_ex_sz()
* struct wlan_bssid_ex and get_wlan_bssid_ex_sz()
*/
typedef struct _WLAN_BSSID_EX
{
struct wlan_bssid_ex {
ULONG Length;
NDIS_802_11_MAC_ADDRESS MacAddress;
u8 Reserved[2];//[0]: IS beacon frame
@ -309,13 +308,11 @@ typedef struct _WLAN_BSSID_EX
WLAN_PHY_INFO PhyInfo;
ULONG IELength;
u8 IEs[MAX_IE_SZ]; //(timestamp, beacon interval, and capability information)
}
__attribute__((packed))
WLAN_BSSID_EX, *PWLAN_BSSID_EX;
} __packed;
__inline static uint get_wlan_bssid_ex_sz(WLAN_BSSID_EX *bss)
__inline static uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss)
{
return (sizeof(WLAN_BSSID_EX) -MAX_IE_SZ + bss->IELength);
return (sizeof(struct wlan_bssid_ex) -MAX_IE_SZ + bss->IELength);
}
struct wlan_network {
@ -325,7 +322,7 @@ struct wlan_network {
unsigned long last_scanned; //timestamp for the network
int aid; //will only be valid when a BSS is joinned.
int join_res;
WLAN_BSSID_EX network; //must be the last item
struct wlan_bssid_ex network; //must be the last item
WLAN_BCN_INFO BcnInfo;
};