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: Remove some configuration variables defined when CONFIG_P2P is defined

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-01 22:48:40 -06:00
parent 7b6e9a069d
commit 27f745af7b
25 changed files with 227 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/autoconf.h
View file

@ -33,15 +33,6 @@
#define CONFIG_AP_MODE
#define CONFIG_P2P
#ifdef CONFIG_P2P
//The CONFIG_WFD is for supporting the Wi-Fi display
#define CONFIG_WFD
#define CONFIG_P2P_REMOVE_GROUP_INFO
#define CONFIG_P2P_PS
#define P2P_OP_CHECK_SOCIAL_CH
#endif
#define CONFIG_SKB_COPY //for amsdu

4
include/drv_types.h
View file

@ -388,9 +388,9 @@ struct adapter {
#endif
#ifdef CONFIG_WFD
#ifdef CONFIG_P2P
struct wifi_display_info wfd_info;
#endif //CONFIG_WFD
#endif //CONFIG_P2P
void * HalData;
u32 hal_data_sz;

4
include/ieee80211.h
View file

@ -1302,12 +1302,12 @@ 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);
#endif
#ifdef CONFIG_WFD
#ifdef CONFIG_P2P
void dump_wfd_ie(u8 *ie, u32 ie_len);
int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen);
int rtw_get_wfd_ie_from_scan_queue(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_ielen, u8 frame_type);
int rtw_get_wfd_attr_content(u8 *wfd_ie, uint wfd_ielen, u8 target_attr_id ,u8 *attr_content, uint *attr_contentlen);
#endif // CONFIG_WFD
#endif // CONFIG_P2P
uint rtw_get_rateset_len(u8 *rateset);

18
include/rtw_mlme.h
View file

@ -195,7 +195,7 @@ struct tx_invite_resp_info{
u8 token; // Used to record the dialog token of p2p invitation request frame.
};
#ifdef CONFIG_WFD
#ifdef CONFIG_P2P
struct wifi_display_info{
u16 wfd_enable; // Eanble/Disable the WFD function.
@ -217,7 +217,7 @@ struct wifi_display_info{
// 1 -> WFD Primary Sink Device
enum SCAN_RESULT_TYPE scan_result_type; // Used when P2P is enable. This parameter will impact the scan result.
};
#endif //CONFIG_WFD
#endif //CONFIG_P2P
struct tx_provdisc_req_info{
u16 wps_config_method_request; // Used when sending the provisioning request frame
@ -247,11 +247,11 @@ struct group_id_info{
struct scan_limit_info{
u8 scan_op_ch_only; // When this flag is set, the driver should just scan the operation channel
#ifndef P2P_OP_CHECK_SOCIAL_CH
#ifndef CONFIG_P2P
u8 operation_ch[2]; // Store the operation channel of invitation request frame
#else
u8 operation_ch[5]; // Store additional channel 1,6,11 for Android 4.2 IOT & Nexus 4
#endif //P2P_OP_CHECK_SOCIAL_CH
#endif //CONFIG_P2P
};
struct cfg80211_wifidirect_info{
@ -281,7 +281,7 @@ struct wifidirect_info{
struct group_id_info groupid_info; // Store the group id information when doing the group negotiation handshake.
struct scan_limit_info rx_invitereq_info; // Used for get the limit scan channel from the Invitation procedure
struct scan_limit_info p2p_info; // Used for get the limit scan channel from the P2P negotiation handshake
#ifdef CONFIG_WFD
#ifdef CONFIG_P2P
struct wifi_display_info *wfd_info;
#endif
enum P2P_ROLE role;
@ -339,7 +339,7 @@ struct wifidirect_info{
// We will use the channel_cnt and channel_list fields when constructing the group negotitation confirm frame.
u8 driver_interface; // Indicate DRIVER_WEXT or DRIVER_CFG80211
#ifdef CONFIG_P2P_PS
#ifdef CONFIG_P2P
enum P2P_PS_MODE p2p_ps_mode; // indicate p2p ps mode
enum P2P_PS_STATE p2p_ps_state; // indicate p2p ps state
u8 noa_index; // Identifies and instance of Notice of Absence timing.
@ -350,7 +350,7 @@ struct wifidirect_info{
u32 noa_duration[P2P_MAX_NOA_NUM]; // Max duration for owner, preferred or min acceptable duration for client.
u32 noa_interval[P2P_MAX_NOA_NUM]; // Length of interval for owner, preferred or max acceptable interval of client.
u32 noa_start_time[P2P_MAX_NOA_NUM]; // schedule expressed in terms of the lower 4 bytes of the TSF timer.
#endif // CONFIG_P2P_PS
#endif // CONFIG_P2P
};
struct tdls_ss_record{ //signal strength record
@ -376,7 +376,7 @@ struct tdls_info{
u8 watchdog_count;
u8 dev_discovered; //WFD_TDLS: for sigma test
u8 enable;
#ifdef CONFIG_WFD
#ifdef CONFIG_P2P
struct wifi_display_info *wfd_info;
#endif
};
@ -511,7 +511,7 @@ struct mlme_priv {
#endif //#if defined (CONFIG_AP_MODE)
#if defined(CONFIG_WFD)
#if defined(CONFIG_P2P)
u8 *wfd_beacon_ie;
u8 *wfd_probe_req_ie;

2
include/rtw_mlme_ext.h
View file

@ -604,7 +604,7 @@ int is_IBSS_empty(struct adapter *padapter);
unsigned char check_assoc_AP(u8 *pframe, uint len);
int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE);
#ifdef CONFIG_WFD
#ifdef CONFIG_P2P
int WFD_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE);
#endif
void WMMOnAssocRsp(struct adapter *padapter);

8
include/rtw_p2p.h
View file

@ -27,7 +27,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf);
u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8* pssid, u8 ussidlen, u8* pdev_raddr );
u32 build_assoc_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 status_code);
u32 build_deauth_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf);
#ifdef CONFIG_WFD
#ifdef CONFIG_P2P
u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf);
u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunneled);
u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf);
@ -40,7 +40,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf);
u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf);
u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf);
u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf);
#endif //CONFIG_WFD
#endif //CONFIG_P2P
u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len);
u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len, struct sta_info *psta);
@ -55,11 +55,11 @@ u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType);
#ifdef CONFIG_P2P_PS
#ifdef CONFIG_P2P
void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength);
void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state);
u8 p2p_ps_wk_cmd(struct adapter*padapter, u8 p2p_ps_state, u8 enqueue);
#endif // CONFIG_P2P_PS
#endif // CONFIG_P2P
void rtw_init_cfg80211_wifidirect_info( struct adapter* padapter);
int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx);

4
include/rtw_tdls.h
View file

@ -101,10 +101,10 @@ void init_off_ch_timer(struct adapter *padapter, struct sta_info *psta);
void init_tdls_alive_timer(struct adapter *padapter, struct sta_info *psta);
void init_handshake_timer(struct adapter *padapter, struct sta_info *psta);
void free_tdls_sta(struct adapter *padapter, struct sta_info *ptdls_sta);
#ifdef CONFIG_WFD
#ifdef CONFIG_P2P
void issue_tunneled_probe_req(struct adapter *padapter);
void issue_tunneled_probe_rsp(struct adapter *padapter, union recv_frame *precv_frame);
#endif //CONFIG_WFD
#endif //CONFIG_P2P
void issue_tdls_dis_req(struct adapter *padapter, u8 *mac_addr);
void issue_tdls_setup_req(struct adapter *padapter, u8 *mac_addr);
void issue_tdls_setup_rsp(struct adapter *padapter, union recv_frame *precv_frame);

4
include/wifi.h
View file

@ -1031,7 +1031,7 @@ enum P2P_PROTO_WK_ID {
P2P_RO_CH_WK = 6,
};
#ifdef CONFIG_P2P_PS
#ifdef CONFIG_P2P
enum P2P_PS_STATE {
P2P_PS_DISABLE = 0,
P2P_PS_ENABLE = 1,
@ -1046,7 +1046,7 @@ enum P2P_PS_MODE {
P2P_PS_NOA = 2,
P2P_PS_MIX = 3, /* CTWindow and NoA */
};
#endif /* CONFIG_P2P_PS */
#endif /* CONFIG_P2P */
/* =====================WFD Section===================== */
/* For Wi-Fi Display */