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 <shivani.baranwal@oss.qualcomm.com>

diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 77eb9bf68cf235c1dda73bed5313000beb388055..aad4e75086b29f36fd0c7a4dac85a09187aeee6a 100644 (file)
--- 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 69946076e2e2043655f31999ab123d09469eac82..83083b509bc48515852a8d1d598125be122e94bf 100644 (file)
--- 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 26c7d44bc7b0feb3babb622c108ad5a129c37fce..885c7d8dc7385055aaa6fd6e327dbc854ecd2c12 100644 (file)
--- 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 121ad38791cd40a4efd6e38286012f39e5492ae9..f7852293b1bc6515021d914d65d7fdb914d16c33 100644 (file)
--- 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