P2P2: Enable some testing parameters without CONFIG_TESTING_OPTIONS

These are needed for testing production devices, so do not require
CONFIG_TESTING_OPTIONS in the build.

Signed-off-by: Shubham Joshi <shujosh@qti.qualcomm.com>

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 630d3e1cc3c69def77b42beb86ee994557af1a4e..9748d598a19bd8873fccee7e43fc360f82fe4855 100644 (file)
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -4962,8 +4962,6 @@ void p2p_set_managed_oper(struct p2p_data *p2p, int enabled)
 }
 
 
-#ifdef CONFIG_TESTING_OPTIONS
-
 void p2p_set_bootstrapmethods(struct p2p_data *p2p, int bootstrap_methods)
 {
        p2p_dbg(p2p, "Bootstraping methods: 0x%x", bootstrap_methods);
@@ -5027,8 +5025,6 @@ void p2p_set_invitation_op_freq(struct p2p_data *p2p, int freq)
        p2p->cfg->inv_op_channel = channel;
 }
 
-#endif /* CONFIG_TESTING_OPTIONS */
-
 
 int p2p_config_get_random_social(struct p2p_config *p2p, u8 *op_class,
                                 u8 *op_channel,

diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 1d3545442ae5667aee7c0011602c715baf323fba..933c76ec5726df08d43e8b7903f1e7b945fc4615 100644 (file)
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -741,7 +741,6 @@ struct p2p_config {
         */
        bool chan_switch_req_enable;
 
-#ifdef CONFIG_TESTING_OPTIONS
        /**
         * Operating class for own operational channel in Invitation Response
         */
@@ -751,7 +750,6 @@ struct p2p_config {
         * inv_op_channel - Own operational channel in Invitation Response
         */
        u8 inv_op_channel;
-#endif /* CONFIG_TESTING_OPTIONS */
 
        /**
         * cb_ctx - Context to use with callback functions

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index c350981e8ee4e5164195f0d33856f177d51ecd2e..229595d36cb65b008242e28f7c621c79104ff291 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -7843,7 +7843,6 @@ static int p2p_ctrl_set(struct wpa_supplicant *wpa_s, char *cmd)
                return 0;
        }
 
-#ifdef CONFIG_TESTING_OPTIONS
        if (os_strcmp(cmd, "supported_bootstrapmethods") == 0) {
                p2p_set_bootstrapmethods(wpa_s->global->p2p, atoi(param));
                return 0;
@@ -7878,7 +7877,6 @@ static int p2p_ctrl_set(struct wpa_supplicant *wpa_s, char *cmd)
                p2p_set_invitation_op_freq(wpa_s->global->p2p, atoi(param));
                return 0;
        }
-#endif /* CONFIG_TESTING_OPTIONS */
 
        wpa_printf(MSG_DEBUG, "CTRL_IFACE: Unknown P2P_SET field value '%s'",
                   cmd);