aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-03-07 09:51:50 (GMT)
committerJouni Malinen <j@w1.fi>2010-03-07 09:51:50 (GMT)
commit0ebdf62735f183538674fe9f06f0b3940f34b654 (patch)
tree2d5ad8fbc07bf9aae22e1957f418571325dfb1a2 /src
parentd3e3a20565b426ce5cd402630812503a78abe9dc (diff)
downloadhostap-0ebdf62735f183538674fe9f06f0b3940f34b654.zip
hostap-0ebdf62735f183538674fe9f06f0b3940f34b654.tar.gz
hostap-0ebdf62735f183538674fe9f06f0b3940f34b654.tar.bz2
Remove unnecessary ifname parameter from set_ap_wps_ie() driver op
Diffstat (limited to 'src')
-rw-r--r--src/ap/ap_drv_ops.c3
-rw-r--r--src/drivers/driver.h4
-rw-r--r--src/drivers/driver_atheros.c3
-rw-r--r--src/drivers/driver_hostap.c3
-rw-r--r--src/drivers/driver_madwifi.c3
-rw-r--r--src/drivers/driver_test.c3
6 files changed, 6 insertions, 13 deletions
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index d79c698..a5978c6 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -44,8 +44,7 @@ static int hostapd_set_ap_wps_ie(struct hostapd_data *hapd,
{
if (hapd->driver == NULL || hapd->driver->set_ap_wps_ie == NULL)
return 0;
- return hapd->driver->set_ap_wps_ie(hapd->conf->iface, hapd->drv_priv,
- beacon, proberesp);
+ return hapd->driver->set_ap_wps_ie(hapd->drv_priv, beacon, proberesp);
}
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 188f34c..df35e5f 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1581,7 +1581,6 @@ struct wpa_driver_ops {
/**
* set_ap_wps_ie - Add WPS IE into Beacon/Probe Response frames (AP)
- * @ifname: The interface name (main or virtual BSS)
* @priv: Private driver interface data
* @beacon: WPS IE for Beacon frames
* @proberesp: WPS IE for Probe Response frames
@@ -1592,8 +1591,7 @@ struct wpa_driver_ops {
* to %NULL) if the driver uses the Beacon template from set_beacon()
* and does not process Probe Request frames.
*/
- int (*set_ap_wps_ie)(const char *ifname, void *priv,
- const struct wpabuf *beacon,
+ int (*set_ap_wps_ie)(void *priv, const struct wpabuf *beacon,
const struct wpabuf *proberesp);
/**
diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index 2b45f66..f718857 100644
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -683,8 +683,7 @@ madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
}
static int
-madwifi_set_ap_wps_ie(const char *ifname, void *priv,
- const struct wpabuf *beacon,
+madwifi_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *proberesp)
{
if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL,
diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index b568bfd..952f389 100644
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -762,8 +762,7 @@ static int hostap_set_generic_elem(void *priv,
}
-static int hostap_set_ap_wps_ie(const char *ifname, void *priv,
- const struct wpabuf *beacon,
+static int hostap_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *proberesp)
{
struct hostap_driver_data *drv = priv;
diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index 08ca54f..8687404 100644
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -786,8 +786,7 @@ madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
}
static int
-madwifi_set_ap_wps_ie(const char *ifname, void *priv,
- const struct wpabuf *beacon,
+madwifi_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *proberesp)
{
if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL,
diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 9cd36ba..4a57b30 100644
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -840,8 +840,7 @@ static int test_driver_set_generic_elem(void *priv,
}
-static int test_driver_set_ap_wps_ie(const char *ifname, void *priv,
- const struct wpabuf *beacon,
+static int test_driver_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *proberesp)
{
struct test_driver_bss *bss = priv;