jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename driver op for temporarily disallowed BSSIDs

Browse source 
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>
This commit is contained in:
Jouni Malinen 2020-07-24 12:13:19 +03:00 committed by Jouni Malinen
parent f8c756c5b8
commit f4877083ec
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/drivers/driver.h
View file

@ -4387,13 +4387,13 @@ struct wpa_driver_ops {
int (*ignore_assoc_disallow)(void *priv, int ignore_disallow); 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 * @priv: Private driver interface data
* @num_bssid: Number of blacklist BSSIDs * @num_bssid: Number of temporarily disallowed BSSIDs
* @bssids: List of blacklisted BSSIDs * @bssids: List of temporarily disallowed BSSIDs
*/ */
int (*set_bssid_blacklist)(void *priv, unsigned int num_bssid, int (*set_bssid_tmp_disallow)(void *priv, unsigned int num_bssid,
const u8 *bssid); const u8 *bssid);
/** /**
* update_connect_params - Update the connection parameters * update_connect_params - Update the connection parameters

9
src/drivers/driver_nl80211.c
View file

@ -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 */ /* Reserved QCA_WLAN_VENDOR_ATTR_ROAMING_REQ_ID value for wpa_supplicant */
#define WPA_SUPPLICANT_CLIENT_ID 1 #define WPA_SUPPLICANT_CLIENT_ID 1
static int nl80211_set_bssid_blacklist(void *priv, unsigned int num_bssid, static int nl80211_set_bssid_tmp_disallow(void *priv, unsigned int num_bssid,
const u8 *bssid) const u8 *bssid)
{ {
struct i802_bss *bss = priv; struct i802_bss *bss = priv;
struct wpa_driver_nl80211_data *drv = bss->drv; 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; struct nlattr *params, *nlbssids, *attr;
unsigned int i; 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); num_bssid);
if (!drv->roam_vendor_cmd_avail) 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, .get_bss_transition_status = nl80211_get_bss_transition_status,
.ignore_assoc_disallow = nl80211_ignore_assoc_disallow, .ignore_assoc_disallow = nl80211_ignore_assoc_disallow,
#endif /* CONFIG_MBO */ #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, .add_sta_node = nl80211_add_sta_node,
#endif /* CONFIG_DRIVER_NL80211_QCA */ #endif /* CONFIG_DRIVER_NL80211_QCA */
.configure_data_frame_filters = nl80211_configure_data_frame_filters, .configure_data_frame_filters = nl80211_configure_data_frame_filters,

12
wpa_supplicant/driver_i.h
View file

@ -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); 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, static inline int wpa_drv_set_bssid_tmp_disallow(struct wpa_supplicant *wpa_s,
unsigned int num_bssid, unsigned int num_bssid,
const u8 *bssids) const u8 *bssids)
{ {
if (!wpa_s->driver->set_bssid_blacklist) if (!wpa_s->driver->set_bssid_tmp_disallow)
return -1; return -1;
return wpa_s->driver->set_bssid_blacklist(wpa_s->drv_priv, num_bssid, return wpa_s->driver->set_bssid_tmp_disallow(wpa_s->drv_priv, num_bssid,
bssids); bssids);
} }
static inline int wpa_drv_update_connect_params( static inline int wpa_drv_update_connect_params(

2
wpa_supplicant/wpa_supplicant.c
View file

@ -7929,7 +7929,7 @@ static int wpa_set_driver_tmp_disallow_list(struct wpa_supplicant *wpa_s)
ETH_ALEN); ETH_ALEN);
num_bssid++; 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); os_free(bssids);
return ret; return ret;
} }