P2P: Use enum p2p_status_code more consistently for PD

It is clearer to use enum p2p_status_code instead of u8 when processing
and passing the P2P Status Code to other components.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 0127f32cad437ab3ad5792d323eecdd8f04d0efb..7df2063f12e01cfd0758b8f5c6b9ce8ede8aa39a 100644 (file)
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -1180,7 +1180,8 @@ struct p2p_config {
         * When P2PS provisioning completes (successfully or not) we must
         * transmit all of the results to the upper layers.
         */
-       void (*p2ps_prov_complete)(void *ctx, u8 status, const u8 *dev,
+       void (*p2ps_prov_complete)(void *ctx, enum p2p_status_code status,
+                                  const u8 *dev,
                                   const u8 *adv_mac, const u8 *ses_mac,
                                   const u8 *grp_mac, u32 adv_id, u32 ses_id,
                                   u8 conncap, int passwd_id,

diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
index 0dd2260b4926c02578266c92444306241a899634..fb2031310e9d62c9c219c5d01a08155958536401 100644 (file)
--- a/src/p2p/p2p_pd.c
+++ b/src/p2p/p2p_pd.c
@@ -1637,7 +1637,7 @@ static void p2p_process_prov_disc_bootstrap_resp(struct p2p_data *p2p,
                                                 size_t len, int rx_freq)
 {
        struct p2p_device *dev;
-       u8 status = P2P_SC_SUCCESS;
+       enum p2p_status_code status = P2P_SC_SUCCESS;
        size_t cookie_len = 0;
        const u8 *pos, *cookie;
        u16 comeback_after;
@@ -1726,7 +1726,7 @@ static void p2p_process_prov_disc_resp(struct p2p_data *p2p,
 {
        struct p2p_device *dev;
        u16 report_config_methods = 0, req_config_methods;
-       u8 status = P2P_SC_SUCCESS;
+       enum p2p_status_code status = P2P_SC_SUCCESS;
        u32 adv_id = 0;
        u8 conncap = P2PS_SETUP_NEW;
        u8 adv_mac[ETH_ALEN];

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 51b5b2561d354e6d2600fcfbd8444912302d4bd4..259ae47dddcfedca0a1d20110fd6c8cf87428b16 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -4465,7 +4465,8 @@ static void wpas_p2ps_get_feat_cap_str(char *buf, size_t buf_len,
 }
 
 
-static void wpas_p2ps_prov_complete(void *ctx, u8 status, const u8 *dev,
+static void wpas_p2ps_prov_complete(void *ctx, enum p2p_status_code status,
+                                   const u8 *dev,
                                    const u8 *adv_mac, const u8 *ses_mac,
                                    const u8 *grp_mac, u32 adv_id, u32 ses_id,
                                    u8 conncap, int passwd_id,