Remove unused shared_freq driver op

This driver op is not used anymore

Signed-off-by: Eliad Peller <eliad@wizery.com>

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 4074b87..5566201 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -2657,18 +2657,6 @@ struct wpa_driver_ops {
                          int encrypt);
 
        /**
-        * shared_freq - Get operating frequency of shared interface(s)
-        * @priv: Private driver interface data
-        * Returns: Operating frequency in MHz, 0 if no shared operation in
-        * use, or -1 on failure
-        *
-        * This command can be used to request the current operating frequency
-        * of any virtual interface that shares the same radio to provide
-        * information for channel selection for other virtual interfaces.
-        */
-       int (*shared_freq)(void *priv);
-
-       /**
         * get_noa - Get current Notice of Absence attribute payload
         * @priv: Private driver interface data
         * @buf: Buffer for returning NoA

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index aaff9ab..023823f 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -6522,47 +6522,6 @@ static int nl80211_signal_poll(void *priv, struct wpa_signal_info *si)
 }
 
 
-static int wpa_driver_nl80211_shared_freq(void *priv)
-{
-       struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       struct wpa_driver_nl80211_data *driver;
-       int freq = 0;
-
-       /*
-        * If the same PHY is in connected state with some other interface,
-        * then retrieve the assoc freq.
-        */
-       wpa_printf(MSG_DEBUG, "nl80211: Get shared freq for PHY %s",
-                  drv->phyname);
-
-       dl_list_for_each(driver, &drv->global->interfaces,
-                        struct wpa_driver_nl80211_data, list) {
-               if (drv == driver ||
-                   os_strcmp(drv->phyname, driver->phyname) != 0 ||
-                   !driver->associated)
-                       continue;
-
-               wpa_printf(MSG_DEBUG, "nl80211: Found a match for PHY %s - %s "
-                          MACSTR,
-                          driver->phyname, driver->first_bss->ifname,
-                          MAC2STR(driver->first_bss->addr));
-               if (is_ap_interface(driver->nlmode))
-                       freq = driver->first_bss->freq;
-               else
-                       freq = nl80211_get_assoc_freq(driver);
-               wpa_printf(MSG_DEBUG, "nl80211: Shared freq for PHY %s: %d",
-                          drv->phyname, freq);
-       }
-
-       if (!freq)
-               wpa_printf(MSG_DEBUG, "nl80211: No shared interface for "
-                          "PHY (%s) in associated state", drv->phyname);
-
-       return freq;
-}
-
-
 static int nl80211_send_frame(void *priv, const u8 *data, size_t data_len,
                              int encrypt)
 {
@@ -8498,7 +8457,6 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .signal_monitor = nl80211_signal_monitor,
        .signal_poll = nl80211_signal_poll,
        .send_frame = nl80211_send_frame,
-       .shared_freq = wpa_driver_nl80211_shared_freq,
        .set_param = nl80211_set_param,
        .get_radio_name = nl80211_get_radio_name,
        .add_pmkid = nl80211_add_pmkid,

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index 65b430d..ffee1f7 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -503,13 +503,6 @@ static inline int wpa_drv_set_ap_wps_ie(struct wpa_supplicant *wpa_s,
                                            proberesp, assocresp);
 }
 
-static inline int wpa_drv_shared_freq(struct wpa_supplicant *wpa_s)
-{
-       if (!wpa_s->driver->shared_freq)
-               return -1;
-       return wpa_s->driver->shared_freq(wpa_s->drv_priv);
-}
-
 static inline int wpa_drv_get_noa(struct wpa_supplicant *wpa_s,
                                  u8 *buf, size_t buf_len)
 {