aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-03-07 09:45:41 (GMT)
committerJouni Malinen <j@w1.fi>2010-03-07 09:45:41 (GMT)
commit3234cba40e6802d97c3df0339c4392fd2c1f294f (patch)
treeb52de79a8e2d040ea29435c602da4ed18aa9fdf2
parent62847751e4d7e478198424767944ce79a464fecd (diff)
downloadhostap-3234cba40e6802d97c3df0339c4392fd2c1f294f.zip
hostap-3234cba40e6802d97c3df0339c4392fd2c1f294f.tar.gz
hostap-3234cba40e6802d97c3df0339c4392fd2c1f294f.tar.bz2
Remove unnecessary ifname parameter to sta_set_flags() driver op
-rw-r--r--src/ap/ap_drv_ops.c2
-rw-r--r--src/drivers/driver.h3
-rw-r--r--src/drivers/driver_atheros.c2
-rw-r--r--src/drivers/driver_bsd.c2
-rw-r--r--src/drivers/driver_hostap.c5
-rw-r--r--src/drivers/driver_madwifi.c2
-rw-r--r--src/drivers/driver_nl80211.c6
-rw-r--r--wpa_supplicant/driver_i.h3
8 files changed, 11 insertions, 14 deletions
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index 2261cdf..75c74a7 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -487,7 +487,7 @@ int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
{
if (hapd->driver == NULL || hapd->driver->sta_set_flags == NULL)
return 0;
- return hapd->driver->sta_set_flags(hapd->conf->iface, hapd->drv_priv, addr, total_flags,
+ return hapd->driver->sta_set_flags(hapd->drv_priv, addr, total_flags,
flags_or, flags_and);
}
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index c146bf0..0d3567f 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1411,7 +1411,6 @@ struct wpa_driver_ops {
/**
* sta_set_flags - Set station flags (AP only)
- * @ifname: Interface name (for multi-SSID/VLAN support)
* @priv: Private driver interface data
* @addr: Station address
* @total_flags: Bitmap of all WPA_STA_* flags currently set
@@ -1419,7 +1418,7 @@ struct wpa_driver_ops {
* @flags_and: Bitmap of WPA_STA_* flags to us as a mask
* Returns: 0 on success, -1 on failure
*/
- int (*sta_set_flags)(const char *ifname, void *priv, const u8 *addr,
+ int (*sta_set_flags)(void *priv, const u8 *addr,
int total_flags, int flags_or, int flags_and);
/**
diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index ba21de3..2b45f66 100644
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -339,7 +339,7 @@ madwifi_set_sta_authorized(void *priv, const u8 *addr, int authorized)
}
static int
-madwifi_sta_set_flags(const char *ifname, void *priv, const u8 *addr,
+madwifi_sta_set_flags(void *priv, const u8 *addr,
int total_flags, int flags_or, int flags_and)
{
/* For now, only support setting Authorized flag */
diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 941db51..47acbb9 100644
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -468,7 +468,7 @@ bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
}
static int
-bsd_set_sta_authorized(const char *ifname, void *priv, const u8 *addr,
+bsd_set_sta_authorized(void *priv, const u8 *addr,
int total_flags, int flags_or, int flags_and)
{
int authorized = -1;
diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index 476cba5..b568bfd 100644
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -333,7 +333,7 @@ static int hostap_send_eapol(void *priv, const u8 *addr, const u8 *data,
}
-static int hostap_sta_set_flags(const char *ifname, void *priv, const u8 *addr,
+static int hostap_sta_set_flags(void *priv, const u8 *addr,
int total_flags, int flags_or, int flags_and)
{
struct hostap_driver_data *drv = priv;
@@ -662,8 +662,7 @@ static int hostap_sta_remove(void *priv, const u8 *addr)
struct hostap_driver_data *drv = priv;
struct prism2_hostapd_param param;
- hostap_sta_set_flags(drv->iface, drv, addr, 0, 0,
- ~WPA_STA_AUTHORIZED);
+ hostap_sta_set_flags(drv, addr, 0, 0, ~WPA_STA_AUTHORIZED);
memset(&param, 0, sizeof(param));
param.cmd = PRISM2_HOSTAPD_REMOVE_STA;
diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index 40abdb5..08ca54f 100644
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -384,7 +384,7 @@ madwifi_set_sta_authorized(void *priv, const u8 *addr, int authorized)
}
static int
-madwifi_sta_set_flags(const char *ifname, void *priv, const u8 *addr,
+madwifi_sta_set_flags(void *priv, const u8 *addr,
int total_flags, int flags_or, int flags_and)
{
/* For now, only support setting Authorized flag */
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index e566703..ac30562 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3404,8 +3404,8 @@ static u32 sta_flags_nl80211(int flags)
}
-static int wpa_driver_nl80211_sta_set_flags(const char *ifname, void *priv,
- const u8 *addr, int total_flags,
+static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
+ int total_flags,
int flags_or, int flags_and)
{
struct i802_bss *bss = priv;
@@ -3427,7 +3427,7 @@ static int wpa_driver_nl80211_sta_set_flags(const char *ifname, void *priv,
0, NL80211_CMD_SET_STATION, 0);
NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
- if_nametoindex(ifname));
+ if_nametoindex(bss->ifname));
NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
/*
diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index d92a734..8b312a4 100644
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -365,8 +365,7 @@ static inline int wpa_drv_sta_set_flags(struct wpa_supplicant *wpa_s,
int flags_or, int flags_and)
{
if (wpa_s->driver->sta_set_flags)
- return wpa_s->driver->sta_set_flags(wpa_s->ifname,
- wpa_s->drv_priv, addr,
+ return wpa_s->driver->sta_set_flags(wpa_s->drv_priv, addr,
total_flags, flags_or,
flags_and);
return -1;