Remove set_intra_bss() driver_ops

This has been replaced by the isolate parameter available through
set_ap() calls.

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index dd36db989aee58b306d718a08a77d597ce179a6a..3c9f91e4aae7048761789dc2fe4a6ac1956cd41e 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -2130,13 +2130,6 @@ struct wpa_driver_ops {
         */
        int (*ampdu)(void *priv, int ampdu);
 
-       /**
-        * set_intra_bss - Enables/Disables intra BSS bridging
-        *
-        * DEPRECATED - use set_ap() parameter isolate instead
-        */
-       int (*set_intra_bss)(void *priv, int enabled);
-
        /**
         * get_radio_name - Get physical radio name for the device
         * @priv: Private driver interface data

diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c
index f7d572817daf4f7cdb86490d3c11a37ce67b8148..d77cc1029d12b014566bd749e0689e23e60f7fc3 100644 (file)
--- a/src/drivers/driver_ndis.c
+++ b/src/drivers/driver_ndis.c
@@ -3305,7 +3305,6 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = {
        NULL /* set_noa */,
        NULL /* set_p2p_powersave */,
        NULL /* ampdu */,
-       NULL /* set_intra_bss */,
        NULL /* get_radio_name */,
        NULL /* p2p_find */,
        NULL /* p2p_stop_find */,

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 882cac4351de386c2fe2e43fc65a43cccf30bce5..7b0cd2118e648f58aa2738f14c74b545e6c1148c 100644 (file)
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -431,7 +431,6 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
        if (ssid->mode == WPAS_MODE_P2P_GO ||
            ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION)
                params.p2p = 1;
-       wpa_drv_set_intra_bss(wpa_s, wpa_s->conf->p2p_intra_bss);
 #endif /* CONFIG_P2P */
 
        if (wpa_s->parent->set_ap_uapsd)

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index 2f439fc0a1d969febf096a5ed8ad30e0a0594791..b959962daea6eb03e96efc061d58d522a0f6e386 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -444,14 +444,6 @@ static inline int wpa_drv_if_remove(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_intra_bss(struct wpa_supplicant *wpa_s,
-                                       int enabled)
-{
-       if (wpa_s->driver->set_intra_bss)
-               return wpa_s->driver->set_intra_bss(wpa_s->drv_priv, enabled);
-       return -1;
-}
-
 static inline int wpa_drv_remain_on_channel(struct wpa_supplicant *wpa_s,
                                            unsigned int freq,
                                            unsigned int duration)