diff --git a/components/p2p/core/src/wlan_p2p_main.c b/components/p2p/core/src/wlan_p2p_main.c index 711542da59..4925785c73 100644 --- a/components/p2p/core/src/wlan_p2p_main.c +++ b/components/p2p/core/src/wlan_p2p_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -565,9 +565,6 @@ static QDF_STATUS p2p_object_init_params( cfg_get(psoc, CFG_GO_LINK_MONITOR_PERIOD); p2p_soc_obj->param.p2p_device_addr_admin = cfg_get(psoc, CFG_P2P_DEVICE_ADDRESS_ADMINISTRATED); - p2p_soc_obj->param.skip_dfs_channel_p2p_search = - cfg_get(psoc, CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH); - return QDF_STATUS_SUCCESS; } diff --git a/components/p2p/core/src/wlan_p2p_main.h b/components/p2p/core/src/wlan_p2p_main.h index 627ffb1f5b..fe9801c7fd 100644 --- a/components/p2p/core/src/wlan_p2p_main.h +++ b/components/p2p/core/src/wlan_p2p_main.h @@ -201,7 +201,6 @@ struct p2p_param { uint32_t go_keepalive_period; uint32_t go_link_monitor_period; bool p2p_device_addr_admin; - bool skip_dfs_channel_p2p_search; }; /** diff --git a/components/p2p/dispatcher/inc/wlan_p2p_cfg.h b/components/p2p/dispatcher/inc/wlan_p2p_cfg.h index 3ee037f5a0..c2f5541b52 100644 --- a/components/p2p/dispatcher/inc/wlan_p2p_cfg.h +++ b/components/p2p/dispatcher/inc/wlan_p2p_cfg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -98,31 +98,9 @@ 1, \ "derive the P2P MAC address from the primary MAC address") -/* - * - * gSkipDfsChannelInP2pSearch - Skip DFS Channel in case of P2P Search - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to disable(skip) dfs channel in p2p search. - * Related: None. - * - * Supported Feature: DFS P2P - * - * Usage: Internal/External - * - * - */ -#define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH CFG_INI_BOOL( \ - "gSkipDfsChannelInP2pSearch", \ - 1, \ - "skip dfs channel in p2p search") - #define CFG_P2P_ALL \ CFG(CFG_GO_KEEP_ALIVE_PERIOD) \ CFG(CFG_GO_LINK_MONITOR_PERIOD) \ - CFG(CFG_P2P_DEVICE_ADDRESS_ADMINISTRATED) \ - CFG(CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH) + CFG(CFG_P2P_DEVICE_ADDRESS_ADMINISTRATED) #endif diff --git a/components/p2p/dispatcher/inc/wlan_p2p_cfg_api.h b/components/p2p/dispatcher/inc/wlan_p2p_cfg_api.h index 18e86055bc..b3167be4b8 100644 --- a/components/p2p/dispatcher/inc/wlan_p2p_cfg_api.h +++ b/components/p2p/dispatcher/inc/wlan_p2p_cfg_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -61,16 +61,4 @@ QDF_STATUS cfg_p2p_get_device_addr_admin(struct wlan_objmgr_psoc *psoc, bool *enable); -/** - * cfg_p2p_get_skip_dfs_channel_p2p_search() - get skip dfs channel - * in p2p search - * @psoc: pointer to psoc object - * @enable: enable/disable skip dfs channel in p2p search - * - * This function gets enable/disable skip dfs channel in p2p search - */ -QDF_STATUS -cfg_p2p_get_skip_dfs_channel_p2p_search(struct wlan_objmgr_psoc *psoc, - bool *enable); - #endif /* _WLAN_P2P_CFG_API_H_ */ diff --git a/components/p2p/dispatcher/src/wlan_p2p_cfg.c b/components/p2p/dispatcher/src/wlan_p2p_cfg.c index 490b95821e..f0cfa76710 100644 --- a/components/p2p/dispatcher/src/wlan_p2p_cfg.c +++ b/components/p2p/dispatcher/src/wlan_p2p_cfg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -86,20 +86,3 @@ cfg_p2p_get_device_addr_admin(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_SUCCESS; } -QDF_STATUS -cfg_p2p_get_skip_dfs_channel_p2p_search(struct wlan_objmgr_psoc *psoc, - bool *enable) -{ - struct p2p_soc_priv_obj *p2p_soc_obj; - - p2p_soc_obj = wlan_psoc_get_p2p_object(psoc); - if (!p2p_soc_obj) { - *enable = false; - p2p_err("p2p psoc null"); - return QDF_STATUS_E_INVAL; - } - - *enable = p2p_soc_obj->param.skip_dfs_channel_p2p_search; - - return QDF_STATUS_SUCCESS; -} diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 255aca38e1..7744afe6b8 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -9913,7 +9913,6 @@ exit: static int hdd_update_user_config(struct hdd_context *hdd_ctx) { struct wlan_objmgr_psoc_user_config *user_config; - bool skip_dfs_in_p2p_search = false; uint8_t band_capability; QDF_STATUS status; bool value = false; @@ -9937,9 +9936,6 @@ static int hdd_update_user_config(struct hdd_context *hdd_ctx) if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("Invalid 11h_enable flag"); user_config->is_11h_support_enabled = value; - cfg_p2p_get_skip_dfs_channel_p2p_search(hdd_ctx->psoc, - &skip_dfs_in_p2p_search); - user_config->skip_dfs_chnl_in_p2p_search = skip_dfs_in_p2p_search; user_config->band_capability = band_capability; wlan_objmgr_psoc_set_user_config(hdd_ctx->psoc, user_config);