From: Shivani Baranwal Date: Wed, 28 May 2025 09:58:11 +0000 (+0530) Subject: P2P2: Remove configuration params p2p_pairing_setup and p2p_pairing_cache X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07820c10261fb12537b96d9b3c809e999c0e038f;p=thirdparty%2Fhostap.git P2P2: Remove configuration params p2p_pairing_setup and p2p_pairing_cache These configuration parameters were added initially to configure them through wpa_supplicant configutation files. These are not being used as now the p2p_pairing_setup and p2p_pairing_cache are being configured based on driver capabilities. Signed-off-by: Shivani Baranwal --- diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 77eb9bf68..aad4e7508 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -5588,8 +5588,6 @@ static const struct global_parse_data global_fields[] = { { FUNC(p2p_device_persistent_mac_addr), 0 }, { INT(p2p_interface_random_mac_addr), 0 }, { INT(p2p_6ghz_disable), 0 }, - { BOOL(p2p_pairing_setup), 0 }, - { BOOL(p2p_pairing_cache), 0 }, { INT(p2p_bootstrap_methods), 0 }, { INT(p2p_pasn_type), 0 }, { INT(p2p_comeback_after), 0 }, diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h index 69946076e..83083b509 100644 --- a/wpa_supplicant/config.h +++ b/wpa_supplicant/config.h @@ -899,8 +899,6 @@ struct wpa_config { int p2p_optimize_listen_chan; int p2p_6ghz_disable; - bool p2p_pairing_setup; - bool p2p_pairing_cache; int p2p_bootstrap_methods; int p2p_pasn_type; int p2p_comeback_after; diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c index 26c7d44bc..885c7d8dc 100644 --- a/wpa_supplicant/config_file.c +++ b/wpa_supplicant/config_file.c @@ -1393,10 +1393,6 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config) if (config->p2p_6ghz_disable) fprintf(f, "p2p_6ghz_disable=%d\n", config->p2p_6ghz_disable); - if (config->p2p_pairing_setup) - fprintf(f, "p2p_pairing_setup=%d\n", config->p2p_pairing_setup); - if (config->p2p_pairing_cache) - fprintf(f, "p2p_pairing_cache=%d\n", config->p2p_pairing_cache); if (config->p2p_bootstrap_methods) fprintf(f, "p2p_bootstrap_methods=%d\n", config->p2p_bootstrap_methods); diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf index 121ad3879..f7852293b 100644 --- a/wpa_supplicant/wpa_supplicant.conf +++ b/wpa_supplicant/wpa_supplicant.conf @@ -401,12 +401,6 @@ fast_reauth=1 # it from taking 100% of radio resources. The default value is 500 ms. #p2p_search_delay=500 -# Enable/disable P2P pairing setup -#p2p_pairing_setup=0 - -# Enable/disable P2P pairing cache for verification -#p2p_pairing_cache=0 - # Enable/disable P2P pairing verification with cached NIK/NPK #p2p_pairing_verification=0