skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 22:13:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_P2P_PS and CONFIG_P2P_REMOVE_GROUP_INFO

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/rtw_cmd.c
View file

@ -660,11 +660,9 @@ _func_enter_;
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
} }
#ifdef CONFIG_P2P_PS
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1); p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1);
} }
#endif /* CONFIG_P2P_PS */
ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) if (ph2c == NULL)
@ -2501,11 +2499,9 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
case ANT_SELECT_WK_CID: case ANT_SELECT_WK_CID:
antenna_select_wk_hdl(padapter, pdrvextra_cmd->type_size); antenna_select_wk_hdl(padapter, pdrvextra_cmd->type_size);
break; break;
#ifdef CONFIG_P2P_PS
case P2P_PS_WK_CID: case P2P_PS_WK_CID:
p2p_ps_wk_hdl(padapter, pdrvextra_cmd->type_size); p2p_ps_wk_hdl(padapter, pdrvextra_cmd->type_size);
break; break;
#endif /* CONFIG_P2P_PS */
case P2P_PROTO_WK_CID: case P2P_PROTO_WK_CID:
/* Commented by Albert 2011/07/01 */ /* Commented by Albert 2011/07/01 */
/* I used the type_size as the type command */ /* I used the type_size as the type command */

8
core/rtw_mlme.c
View file

@ -839,16 +839,14 @@ exit:
_func_exit_; _func_exit_;
} }
void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork);
void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork) void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv);
/* _queue *queue = &(pmlmepriv->scanned_queue); */
_func_enter_; _func_enter_;
#if defined(CONFIG_P2P) && defined(CONFIG_P2P_REMOVE_GROUP_INFO) #if defined(CONFIG_P2P)
rtw_WLAN_BSSID_EX_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO); rtw_WLAN_BSSID_EX_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO);
#endif #endif
@ -1091,11 +1089,9 @@ _func_enter_;
_exit_critical_bh(&pmlmepriv->lock, &irqL); _exit_critical_bh(&pmlmepriv->lock, &irqL);
#ifdef CONFIG_P2P_PS
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0); p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0);
} }
#endif /* CONFIG_P2P_PS */
rtw_os_xmit_schedule(adapter); rtw_os_xmit_schedule(adapter);
@ -1292,9 +1288,7 @@ _func_enter_;
} }
#ifdef CONFIG_P2P_PS
p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
#endif /* CONFIG_P2P_PS */
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if (padapter->pwrctrlpriv.wowlan_mode==false) if (padapter->pwrctrlpriv.wowlan_mode==false)

3
core/rtw_mlme_ext.c
View file

@ -936,10 +936,7 @@ unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame)
process_csa_ie(padapter, pframe, len); /* channel switch announcement */ process_csa_ie(padapter, pframe, len); /* channel switch announcement */
#endif /* CONFIG_DFS */ #endif /* CONFIG_DFS */
#ifdef CONFIG_P2P_PS
process_p2p_ps_ie(padapter, (pframe + WLAN_HDR_A3_LEN), (len - WLAN_HDR_A3_LEN)); process_p2p_ps_ie(padapter, (pframe + WLAN_HDR_A3_LEN), (len - WLAN_HDR_A3_LEN));
#endif /* CONFIG_P2P_PS */
} }
} }
else if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) else if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE)

2
core/rtw_p2p.c
View file

@ -3586,7 +3586,6 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
#ifdef CONFIG_P2P_PS
void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength) void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength)
{ {
u8 * ies; u8 * ies;
@ -3801,7 +3800,6 @@ _func_exit_;
return res; return res;
} }
#endif /* CONFIG_P2P_PS */
static void reset_ch_sitesurvey_timer_process (void *FunctionContext) static void reset_ch_sitesurvey_timer_process (void *FunctionContext)
{ {

9
core/rtw_pwrctrl.c
View file

@ -465,10 +465,7 @@ _func_enter_;
/* if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) */ /* if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) */
if (ps_mode == PS_MODE_ACTIVE) { if (ps_mode == PS_MODE_ACTIVE) {
#ifdef CONFIG_P2P_PS if (pwdinfo->opp_ps == 0) {
if (pwdinfo->opp_ps == 0)
#endif /* CONFIG_P2P_PS */
{
DBG_88E("rtw_set_ps_mode: Leave 802.11 power save\n"); DBG_88E("rtw_set_ps_mode: Leave 802.11 power save\n");
pwrpriv->pwr_mode = ps_mode; pwrpriv->pwr_mode = ps_mode;
rtw_set_rpwm(padapter, PS_STATE_S4); rtw_set_rpwm(padapter, PS_STATE_S4);
@ -491,11 +488,9 @@ _func_enter_;
pwrpriv->bcn_ant_mode = bcn_ant_mode; pwrpriv->bcn_ant_mode = bcn_ant_mode;
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));
#ifdef CONFIG_P2P_PS
/* Set CTWindow after LPS */ /* Set CTWindow after LPS */
if (pwdinfo->opp_ps == 1) if (pwdinfo->opp_ps == 1)
p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 0); p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 0);
#endif /* CONFIG_P2P_PS */
rtw_set_rpwm(padapter, PS_STATE_S2); rtw_set_rpwm(padapter, PS_STATE_S2);
} }
@ -625,9 +620,7 @@ _func_enter_;
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
{ /* connect */ { /* connect */
#ifdef CONFIG_P2P_PS
p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue); p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue);
#endif /* CONFIG_P2P_PS */
rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue); rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue);
} else { } else {

4
hal/rtl8188e_cmd.c
View file

@ -800,7 +800,6 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
#ifdef CONFIG_P2P_PS
void rtl8188e_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state) void rtl8188e_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -811,7 +810,6 @@ void rtl8188e_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state)
_func_enter_; _func_enter_;
#if 1
switch (p2p_ps_state) switch (p2p_ps_state)
{ {
case P2P_PS_DISABLE: case P2P_PS_DISABLE:
@ -878,12 +876,10 @@ _func_enter_;
} }
FillH2CCmd_88E(padapter, H2C_PS_P2P_OFFLOAD, 1, (u8 *)p2p_ps_offload); FillH2CCmd_88E(padapter, H2C_PS_P2P_OFFLOAD, 1, (u8 *)p2p_ps_offload);
#endif
_func_exit_; _func_exit_;
} }
#endif /* CONFIG_P2P_PS */
#ifdef CONFIG_TSF_RESET_OFFLOAD #ifdef CONFIG_TSF_RESET_OFFLOAD
/* /*

2
hal/rtl8188e_dm.c
View file

@ -277,12 +277,10 @@ rtl8188e_HalDmWatchDog(
bFwCurrentInPSMode = Adapter->pwrctrlpriv.bFwCurrentInPSMode; bFwCurrentInPSMode = Adapter->pwrctrlpriv.bFwCurrentInPSMode;
rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake)); rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake));
#ifdef CONFIG_P2P_PS
/* Fw is under p2p powersaving mode, driver should stop dynamic mechanism. */ /* Fw is under p2p powersaving mode, driver should stop dynamic mechanism. */
/* modifed by thomas. 2011.06.11. */ /* modifed by thomas. 2011.06.11. */
if (Adapter->wdinfo.p2p_ps_mode) if (Adapter->wdinfo.p2p_ps_mode)
bFwPSAwake = false; bFwPSAwake = false;
#endif /* CONFIG_P2P_PS */
if ( (hw_init_completed == true) if ( (hw_init_completed == true)
&& ((!bFwCurrentInPSMode) && bFwPSAwake)) && ((!bFwCurrentInPSMode) && bFwPSAwake))

2
hal/usb_halinit.c
View file

@ -2844,14 +2844,12 @@ _func_enter_;
rtl8188e_set_FwJoinBssReport_cmd(Adapter, mstatus); rtl8188e_set_FwJoinBssReport_cmd(Adapter, mstatus);
} }
break; break;
#ifdef CONFIG_P2P_PS
case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
{ {
u8 p2p_ps_state = (*(u8 *)val); u8 p2p_ps_state = (*(u8 *)val);
rtl8188e_set_p2p_ps_offload_cmd(Adapter, p2p_ps_state); rtl8188e_set_p2p_ps_offload_cmd(Adapter, p2p_ps_state);
} }
break; break;
#endif /* CONFIG_P2P_PS */
case HW_VAR_INITIAL_GAIN: case HW_VAR_INITIAL_GAIN:
{ {
DIG_T *pDigTable = &podmpriv->DM_DigTable; DIG_T *pDigTable = &podmpriv->DM_DigTable;

6
include/autoconf.h
View file

@ -53,12 +53,6 @@
#define CONFIG_AP_MODE #define CONFIG_AP_MODE
#define CONFIG_P2P #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, */ #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */

2
include/rtw_mlme.h
View file

@ -318,7 +318,6 @@ 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. 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. 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. // 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_MODE p2p_ps_mode; // indicate p2p ps mode
enum P2P_PS_STATE p2p_ps_state; // indicate p2p ps state enum P2P_PS_STATE p2p_ps_state; // indicate p2p ps state
u8 noa_index; // Identifies and instance of Notice of Absence timing. u8 noa_index; // Identifies and instance of Notice of Absence timing.
@ -329,7 +328,6 @@ struct wifidirect_info{
u32 noa_duration[P2P_MAX_NOA_NUM]; // Max duration for owner, preferred or min acceptable duration for 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_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. 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
}; };
struct tdls_ss_record{ //signal strength record struct tdls_ss_record{ //signal strength record

2
include/rtw_p2p.h
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); 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 process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength);
void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state); void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state);
u8 p2p_ps_wk_cmd(_adapter*padapter, u8 p2p_ps_state, u8 enqueue); u8 p2p_ps_wk_cmd(_adapter*padapter, u8 p2p_ps_state, u8 enqueue);
#endif // CONFIG_P2P_PS
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
void rtw_init_cfg80211_wifidirect_info( _adapter* padapter); void rtw_init_cfg80211_wifidirect_info( _adapter* padapter);

2
include/wifi.h
View file

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