rtl8188eu: Remove CONFIG_P2P_PS and CONFIG_P2P_REMOVE_GROUP_INFO

Both are defined whenever CONFIG_P2P is defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-20 11:25:24 -05:00
parent f004d23436
commit 7333ca4047
12 changed files with 12 additions and 54 deletions

View file

@ -53,12 +53,6 @@
#define CONFIG_AP_MODE
#define CONFIG_P2P
#ifdef CONFIG_P2P
#define CONFIG_P2P_REMOVE_GROUP_INFO
#define CONFIG_P2P_PS
#endif
#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */

View file

@ -318,18 +318,16 @@ struct wifidirect_info{
uint channel_list_attr_len; // This field will contain the length of body of P2P Channel List attribute of group negotitation response frame.
u8 channel_list_attr[100]; // This field will contain the body of P2P Channel List attribute of group negotitation response frame.
// We will use the channel_cnt and channel_list fields when constructing the group negotitation confirm frame.
#ifdef CONFIG_P2P_PS
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.
u8 ctwindow; // Client traffic window. A period of time in TU after TBTT.
u8 opp_ps; // opportunistic power save.
u8 noa_num; // number of NoA descriptor in P2P IE.
u8 noa_count[P2P_MAX_NOA_NUM]; // Count for owner, Type of client.
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
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.
u8 ctwindow; // Client traffic window. A period of time in TU after TBTT.
u8 opp_ps; // opportunistic power save.
u8 noa_num; // number of NoA descriptor in P2P IE.
u8 noa_count[P2P_MAX_NOA_NUM]; // Count for owner, Type of client.
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.
};
struct tdls_ss_record{ //signal strength record

View file

@ -55,11 +55,9 @@ u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType);
#ifdef CONFIG_P2P_PS
void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength);
void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state);
u8 p2p_ps_wk_cmd(_adapter*padapter, u8 p2p_ps_state, u8 enqueue);
#endif // CONFIG_P2P_PS
#ifdef CONFIG_IOCTL_CFG80211
void rtw_init_cfg80211_wifidirect_info( _adapter* padapter);

View file

@ -1099,7 +1099,6 @@ enum P2P_PROTO_WK_ID
P2P_RO_CH_WK = 6,
};
#ifdef CONFIG_P2P_PS
enum P2P_PS_STATE
{
P2P_PS_DISABLE = 0,
@ -1116,7 +1115,6 @@ enum P2P_PS_MODE
P2P_PS_NOA = 2,
P2P_PS_MIX = 3, // CTWindow and NoA
};
#endif // CONFIG_P2P_PS
// =====================WFD Section=====================
// For Wi-Fi Display