Rename driver op for temporarily disallowed BSSIDs

Use the "tmp_disallow" name more consistently so that both the core
wpa_supplicant functionality (struct wpa_bss_tmp_disallowed) and the
wpa_driver_ops callback have more similar names.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index cb412cbfe292c04cf3bc2eaee7af924f222d81f7..e8defaba2118913d2bef5c59743568ebf7ff510e 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -4387,13 +4387,13 @@ struct wpa_driver_ops {
        int (*ignore_assoc_disallow)(void *priv, int ignore_disallow);
 
        /**
-        * set_bssid_blacklist - Set blacklist of BSSIDs to the driver
+        * set_bssid_tmp_disallow - Set disallowed BSSIDs to the driver
         * @priv: Private driver interface data
-        * @num_bssid: Number of blacklist BSSIDs
-        * @bssids: List of blacklisted BSSIDs
+        * @num_bssid: Number of temporarily disallowed BSSIDs
+        * @bssids: List of temporarily disallowed BSSIDs
         */
-       int (*set_bssid_blacklist)(void *priv, unsigned int num_bssid,
-                                  const u8 *bssid);
+       int (*set_bssid_tmp_disallow)(void *priv, unsigned int num_bssid,
+                                     const u8 *bssid);
 
        /**
         * update_connect_params - Update the connection parameters

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index d70b56ba88165a8aef2ed4a7ecb0ad9b69c3b641..14179f79bb7319c65596b4936c43250c7488ce00 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -9924,8 +9924,8 @@ static int nl80211_disable_fils(void *priv, int disable)
 /* Reserved QCA_WLAN_VENDOR_ATTR_ROAMING_REQ_ID value for wpa_supplicant */
 #define WPA_SUPPLICANT_CLIENT_ID 1
 
-static int nl80211_set_bssid_blacklist(void *priv, unsigned int num_bssid,
-                                      const u8 *bssid)
+static int nl80211_set_bssid_tmp_disallow(void *priv, unsigned int num_bssid,
+                                         const u8 *bssid)
 {
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
@@ -9933,7 +9933,8 @@ static int nl80211_set_bssid_blacklist(void *priv, unsigned int num_bssid,
        struct nlattr *params, *nlbssids, *attr;
        unsigned int i;
 
-       wpa_printf(MSG_DEBUG, "nl80211: Set blacklist BSSID (num=%u)",
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: Set temporarily disallowed BSSIDs (num=%u)",
                   num_bssid);
 
        if (!drv->roam_vendor_cmd_avail)
@@ -11745,7 +11746,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .get_bss_transition_status = nl80211_get_bss_transition_status,
        .ignore_assoc_disallow = nl80211_ignore_assoc_disallow,
 #endif /* CONFIG_MBO */
-       .set_bssid_blacklist = nl80211_set_bssid_blacklist,
+       .set_bssid_tmp_disallow = nl80211_set_bssid_tmp_disallow,
        .add_sta_node = nl80211_add_sta_node,
 #endif /* CONFIG_DRIVER_NL80211_QCA */
        .configure_data_frame_filters = nl80211_configure_data_frame_filters,

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index 54ae03b5a7397d2eab3282f4204ec2d4c8fd291e..ba8cc552b9aad6e0f4c87096595423a8417f1b90 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -1069,14 +1069,14 @@ static inline int wpa_drv_ignore_assoc_disallow(struct wpa_supplicant *wpa_s,
        return wpa_s->driver->ignore_assoc_disallow(wpa_s->drv_priv, val);
 }
 
-static inline int wpa_drv_set_bssid_blacklist(struct wpa_supplicant *wpa_s,
-                                             unsigned int num_bssid,
-                                             const u8 *bssids)
+static inline int wpa_drv_set_bssid_tmp_disallow(struct wpa_supplicant *wpa_s,
+                                                unsigned int num_bssid,
+                                                const u8 *bssids)
 {
-       if (!wpa_s->driver->set_bssid_blacklist)
+       if (!wpa_s->driver->set_bssid_tmp_disallow)
                return -1;
-       return wpa_s->driver->set_bssid_blacklist(wpa_s->drv_priv, num_bssid,
-                                                 bssids);
+       return wpa_s->driver->set_bssid_tmp_disallow(wpa_s->drv_priv, num_bssid,
+                                                    bssids);
 }
 
 static inline int wpa_drv_update_connect_params(

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index e7989baef078378082b3885d52ae65f18512f7ca..bda9fe5e4e1575c2f3bec518b76bc2bfc95e6d12 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -7929,7 +7929,7 @@ static int wpa_set_driver_tmp_disallow_list(struct wpa_supplicant *wpa_s)
                          ETH_ALEN);
                num_bssid++;
        }
-       ret = wpa_drv_set_bssid_blacklist(wpa_s, num_bssid, bssids);
+       ret = wpa_drv_set_bssid_tmp_disallow(wpa_s, num_bssid, bssids);
        os_free(bssids);
        return ret;
 }