P2P: Make group operating channel available

Provide local GO channel to the P2P module so that it can be used in
messages that indicate the current operating channel.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 2ce6ea6a8324c852bdc0d426c7b405463c80d4e4..327fe459fc3fdbcb3e7702edc362c31402ed2ca5 100644 (file)
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -1371,6 +1371,11 @@ struct p2p_group_config {
         */
        size_t ssid_len;
 
+       /**
+        * freq - Operating channel of the group
+        */
+       int freq;
+
        /**
         * cb_ctx - Context to use with callback functions
         */

diff --git a/src/p2p/p2p_group.c b/src/p2p/p2p_group.c
index d550da0582fe58bd1a489996d47c7214ac96aa0b..dddf92c93ba6a5e8173f689273b9a59ac8a046d8 100644 (file)
--- a/src/p2p/p2p_group.c
+++ b/src/p2p/p2p_group.c
@@ -999,3 +999,9 @@ void p2p_group_force_beacon_update_ies(struct p2p_group *group)
        group->beacon_update = 1;
        p2p_group_update_ies(group);
 }
+
+
+int p2p_group_get_freq(struct p2p_group *group)
+{
+       return group->cfg->freq;
+}

diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h
index e6727abc643b528c2b056109cc6ffdf419ee491d..fe4e3b3c455c8b2048badf25d2b2a00b80b52e8c 100644 (file)
--- a/src/p2p/p2p_i.h
+++ b/src/p2p/p2p_i.h
@@ -604,6 +604,7 @@ void p2p_group_force_beacon_update_ies(struct p2p_group *group);
 struct wpabuf * p2p_group_get_wfd_ie(struct p2p_group *g);
 void p2p_buf_add_group_info(struct p2p_group *group, struct wpabuf *buf,
                            int max_clients);
+int p2p_group_get_freq(struct p2p_group *group);
 
 
 void p2p_buf_add_action_hdr(struct wpabuf *buf, u8 subtype, u8 dialog_token);

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index a7eb9aaba2a6d8f1d6d1920aea782a85f5fdbfb3..fa9a9853d6d6b91ba91ff00f3b29bb963bc1f68f 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -5235,6 +5235,7 @@ struct p2p_group * wpas_p2p_group_init(struct wpa_supplicant *wpa_s,
                cfg->max_clients = wpa_s->conf->max_num_sta;
        os_memcpy(cfg->ssid, ssid->ssid, ssid->ssid_len);
        cfg->ssid_len = ssid->ssid_len;
+       cfg->freq = ssid->frequency;
        cfg->cb_ctx = wpa_s;
        cfg->ie_update = wpas_p2p_ie_update;
        cfg->idle_update = wpas_p2p_idle_update;