scan: Add a helper function to append supported freqs from a given band

This functionality was repeated for couple of times. Use a shared helper
function to avoid code duplication.

Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 9bcce8c6c22160bdbb11766aa5d231f5e0fcef3c..91ffbf6e2651fd799cefa64d8c94c01851d0546a 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -291,41 +291,6 @@ static void wpas_p2p_scan_res_handler(struct wpa_supplicant *wpa_s,
 }
 
 
-static int wpas_p2p_add_scan_freq_list(struct wpa_supplicant *wpa_s,
-                                      enum hostapd_hw_mode band,
-                                      struct wpa_driver_scan_params *params)
-{
-       struct hostapd_hw_modes *mode;
-       int num_chans = 0;
-       int *freqs, i;
-
-       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, band, 0);
-       if (!mode)
-               return -1;
-
-       if (params->freqs) {
-               while (params->freqs[num_chans])
-                       num_chans++;
-       }
-
-       freqs = os_realloc(params->freqs,
-                          (num_chans + mode->num_channels + 1) * sizeof(int));
-       if (!freqs)
-               return -1;
-
-       params->freqs = freqs;
-
-       for (i = 0; i < mode->num_channels; i++) {
-               if (mode->channels[i].flag & HOSTAPD_CHAN_DISABLED)
-                       continue;
-               params->freqs[num_chans++] = mode->channels[i].freq;
-       }
-       params->freqs[num_chans] = 0;
-
-       return 0;
-}
-
-
 static void wpas_p2p_trigger_scan_cb(struct wpa_radio_work *work, int deinit)
 {
        struct wpa_supplicant *wpa_s = work->wpa_s;
@@ -351,10 +316,10 @@ static void wpas_p2p_trigger_scan_cb(struct wpa_radio_work *work, int deinit)
        if (wpa_s->conf->p2p_6ghz_disable && !params->freqs) {
                wpa_printf(MSG_DEBUG,
                           "P2P: 6 GHz disabled - update the scan frequency list");
-               wpas_p2p_add_scan_freq_list(wpa_s, HOSTAPD_MODE_IEEE80211G,
-                                           params);
-               wpas_p2p_add_scan_freq_list(wpa_s, HOSTAPD_MODE_IEEE80211A,
-                                           params);
+               wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G, params,
+                                       0);
+               wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A, params,
+                                       0);
        }
        ret = wpa_drv_scan(wpa_s, params);
        if (ret == 0)
@@ -5342,10 +5307,10 @@ static void wpas_p2p_join_scan_req(struct wpa_supplicant *wpa_s, int freq,
        } else if (wpa_s->conf->p2p_6ghz_disable) {
                wpa_printf(MSG_DEBUG,
                           "P2P: 6 GHz disabled - update the scan frequency list");
-               wpas_p2p_add_scan_freq_list(wpa_s, HOSTAPD_MODE_IEEE80211G,
-                                           &params);
-               wpas_p2p_add_scan_freq_list(wpa_s, HOSTAPD_MODE_IEEE80211A,
-                                           &params);
+               wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G, &params,
+                                       0);
+               wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A, &params,
+                                       0);
        }
 
        ielen = p2p_scan_ie_buf_len(wpa_s->global->p2p);

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 9ac6581516fd8f0e6bb7ed18eb7df7c1f9f84458..edf3ca800e3efd7f54c0c417ffb04016c1e898b5 100644 (file)
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -670,30 +670,38 @@ static int non_p2p_network_enabled(struct wpa_supplicant *wpa_s)
 #endif /* CONFIG_P2P */
 
 
-static void wpa_setband_scan_freqs_list(struct wpa_supplicant *wpa_s,
-                                       enum hostapd_hw_mode band,
-                                       struct wpa_driver_scan_params *params,
-                                       int is_6ghz)
+int wpa_add_scan_freqs_list(struct wpa_supplicant *wpa_s,
+                           enum hostapd_hw_mode band,
+                           struct wpa_driver_scan_params *params, int is_6ghz)
 {
        /* Include only supported channels for the specified band */
        struct hostapd_hw_modes *mode;
-       int count, i;
+       int num_chans = 0;
+       int *freqs, i;
 
        mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, band, is_6ghz);
-       if (mode == NULL) {
-               /* No channels supported in this band - use empty list */
-               params->freqs = os_zalloc(sizeof(int));
-               return;
+       if (!mode)
+               return -1;
+
+       if (params->freqs) {
+               while (params->freqs[num_chans])
+                       num_chans++;
        }
 
-       params->freqs = os_calloc(mode->num_channels + 1, sizeof(int));
-       if (params->freqs == NULL)
-               return;
-       for (count = 0, i = 0; i < mode->num_channels; i++) {
+       freqs = os_realloc(params->freqs,
+                          (num_chans + mode->num_channels + 1) * sizeof(int));
+       if (!freqs)
+               return -1;
+
+       params->freqs = freqs;
+       for (i = 0; i < mode->num_channels; i++) {
                if (mode->channels[i].flag & HOSTAPD_CHAN_DISABLED)
                        continue;
-               params->freqs[count++] = mode->channels[i].freq;
+               params->freqs[num_chans++] = mode->channels[i].freq;
        }
+       params->freqs[num_chans] = 0;
+
+       return 0;
 }
 
 
@@ -704,12 +712,13 @@ static void wpa_setband_scan_freqs(struct wpa_supplicant *wpa_s,
                return; /* unknown what channels the driver supports */
        if (params->freqs)
                return; /* already using a limited channel set */
+
        if (wpa_s->setband == WPA_SETBAND_5G)
-               wpa_setband_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A,
-                                           params, 0);
+               wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A, params,
+                                       0);
        else if (wpa_s->setband == WPA_SETBAND_2G)
-               wpa_setband_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G,
-                                           params, 0);
+               wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G, params,
+                                       0);
 }
 
 

diff --git a/wpa_supplicant/scan.h b/wpa_supplicant/scan.h
index c9ce2cecf8aeaacb8cb27409c8228504b062d16c..4dd3f8360cbc2ed3328972bfe8933f84a6beb98f 100644 (file)
--- a/wpa_supplicant/scan.h
+++ b/wpa_supplicant/scan.h
@@ -86,5 +86,8 @@ unsigned int wpas_get_est_tpt(const struct wpa_supplicant *wpa_s,
                              const u8 *ies, size_t ies_len, int rate,
                              int snr);
 void wpa_supplicant_set_default_scan_ies(struct wpa_supplicant *wpa_s);
+int wpa_add_scan_freqs_list(struct wpa_supplicant *wpa_s,
+                           enum hostapd_hw_mode band,
+                           struct wpa_driver_scan_params *params, int is_6ghz);
 
 #endif /* SCAN_H */