aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-03-07 09:29:17 (GMT)
committerJouni Malinen <j@w1.fi>2010-03-07 09:29:17 (GMT)
commitd5dd016a8acd41e5b74804da492d1f9706ff6345 (patch)
tree5b441b43a6f9dcc019eb1bd67a31cd0c0df75aeb /src
parent044372a3336ead763980aeffb69c859a6b291775 (diff)
downloadhostap-d5dd016a8acd41e5b74804da492d1f9706ff6345.zip
hostap-d5dd016a8acd41e5b74804da492d1f9706ff6345.tar.gz
hostap-d5dd016a8acd41e5b74804da492d1f9706ff6345.tar.bz2
Remove unneeded ifname parameter from set_privacy() driver op
Diffstat (limited to 'src')
-rw-r--r--src/ap/ap_drv_ops.c3
-rw-r--r--src/drivers/driver.h2
-rw-r--r--src/drivers/driver_atheros.c4
-rw-r--r--src/drivers/driver_bsd.c2
-rw-r--r--src/drivers/driver_hostap.c2
-rw-r--r--src/drivers/driver_madwifi.c4
-rw-r--r--src/drivers/driver_test.c6
7 files changed, 10 insertions, 13 deletions
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index def8db8..8546717 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -373,8 +373,7 @@ int hostapd_set_privacy(struct hostapd_data *hapd, int enabled)
{
if (hapd->driver == NULL || hapd->driver->set_privacy == NULL)
return 0;
- return hapd->driver->set_privacy(hapd->conf->iface, hapd->drv_priv,
- enabled);
+ return hapd->driver->set_privacy(hapd->drv_priv, enabled);
}
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 3cab8f5..408573a 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1219,7 +1219,7 @@ struct wpa_driver_ops {
* kernel driver for Beacon frames. This can be left undefined (set to
* %NULL) if the driver uses the Beacon template from set_beacon().
*/
- int (*set_privacy)(const char *ifname, void *priv, int enabled);
+ int (*set_privacy)(void *priv, int enabled);
/**
* get_seqnum - Fetch the current TSC/packet number (AP only)
diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index 94e139a..77e4418 100644
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -304,7 +304,7 @@ madwifi_set_ieee8021x(void *priv, struct wpa_bss_params *params)
}
static int
-madwifi_set_privacy(const char *ifname, void *priv, int enabled)
+madwifi_set_privacy(void *priv, int enabled)
{
struct madwifi_driver_data *drv = priv;
@@ -1110,7 +1110,7 @@ madwifi_init(struct hostapd_data *hapd, struct wpa_init_params *params)
/* mark down during setup */
linux_set_iface_flags(drv->ioctl_sock, drv->iface, 0);
- madwifi_set_privacy(drv->iface, drv, 0); /* default to no privacy */
+ madwifi_set_privacy(drv, 0); /* default to no privacy */
madwifi_receive_probe_req(drv);
diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 7e060d4..f85fe9d 100644
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -596,7 +596,7 @@ ether_sprintf(const u8 *addr)
}
static int
-bsd_set_privacy(const char *ifname, void *priv, int enabled)
+bsd_set_privacy(void *priv, int enabled)
{
wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index b461e96..25fa78a 100644
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -541,7 +541,7 @@ static int hostap_set_ieee8021x(void *priv, struct wpa_bss_params *params)
}
-static int hostap_set_privacy(const char *ifname, void *priv, int enabled)
+static int hostap_set_privacy(void *priv, int enabled)
{
struct hostap_drvier_data *drv = priv;
diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index 90036cf..b78fc29 100644
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -349,7 +349,7 @@ madwifi_set_ieee8021x(void *priv, struct wpa_bss_params *params)
}
static int
-madwifi_set_privacy(const char *ifname, void *priv, int enabled)
+madwifi_set_privacy(void *priv, int enabled)
{
struct madwifi_driver_data *drv = priv;
@@ -1180,7 +1180,7 @@ madwifi_init(struct hostapd_data *hapd, struct wpa_init_params *params)
/* mark down during setup */
linux_set_iface_flags(drv->ioctl_sock, drv->iface, 0);
- madwifi_set_privacy(drv->iface, drv, 0); /* default to no privacy */
+ madwifi_set_privacy(drv, 0); /* default to no privacy */
madwifi_receive_probe_req(drv);
diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 85ebd66..6b41135 100644
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -1061,13 +1061,11 @@ static int test_driver_set_ssid(const char *ifname, void *priv, const u8 *buf,
}
-static int test_driver_set_privacy(const char *ifname, void *priv, int enabled)
+static int test_driver_set_privacy(void *priv, int enabled)
{
struct test_driver_bss *dbss = priv;
- wpa_printf(MSG_DEBUG, "%s(ifname=%s enabled=%d)",
- __func__, ifname, enabled);
-
+ wpa_printf(MSG_DEBUG, "%s(enabled=%d)", __func__, enabled);
dbss->privacy = enabled;
return 0;