aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-03-07 09:36:45 (GMT)
committerJouni Malinen <j@w1.fi>2010-03-07 09:36:45 (GMT)
commit8709de1ae8e48c53f9530cd4f84a2b751d9d5081 (patch)
tree9125c47af6a8f879c227a51dfb275c78ad3f979d /src
parentaa48451698a86c3ed77add18993cfe89ca2f3975 (diff)
downloadhostap-8709de1ae8e48c53f9530cd4f84a2b751d9d5081.zip
hostap-8709de1ae8e48c53f9530cd4f84a2b751d9d5081.tar.gz
hostap-8709de1ae8e48c53f9530cd4f84a2b751d9d5081.tar.bz2
Remove unnecessary ifname parameter from hapd_get_ssid/hapd_set_ssid
Diffstat (limited to 'src')
-rw-r--r--src/ap/ap_drv_ops.c6
-rw-r--r--src/drivers/driver.h8
-rw-r--r--src/drivers/driver_atheros.c4
-rw-r--r--src/drivers/driver_bsd.c4
-rw-r--r--src/drivers/driver_hostap.c3
-rw-r--r--src/drivers/driver_madwifi.c4
-rw-r--r--src/drivers/driver_test.c5
7 files changed, 14 insertions, 20 deletions
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index e387073..b392ebd 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -390,8 +390,7 @@ int hostapd_get_ssid(struct hostapd_data *hapd, u8 *buf, size_t len)
{
if (hapd->driver == NULL || hapd->driver->hapd_get_ssid == NULL)
return 0;
- return hapd->driver->hapd_get_ssid(hapd->conf->iface, hapd->drv_priv,
- buf, len);
+ return hapd->driver->hapd_get_ssid(hapd->drv_priv, buf, len);
}
@@ -399,8 +398,7 @@ int hostapd_set_ssid(struct hostapd_data *hapd, const u8 *buf, size_t len)
{
if (hapd->driver == NULL || hapd->driver->hapd_set_ssid == NULL)
return 0;
- return hapd->driver->hapd_set_ssid(hapd->conf->iface, hapd->drv_priv,
- buf, len);
+ return hapd->driver->hapd_set_ssid(hapd->drv_priv, buf, len);
}
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 5cf9c94..d3b8e85 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1326,7 +1326,6 @@ struct wpa_driver_ops {
/**
* hapd_get_ssid - Get the current SSID (AP only)
- * @ifname: Interface (master or virtual BSS)
* @priv: Private driver interface data
* @buf: Buffer for returning the SSID
* @len: Maximum length of the buffer
@@ -1336,18 +1335,17 @@ struct wpa_driver_ops {
* template from set_beacon() and does not reply to Probe Request
* frames.
*/
- int (*hapd_get_ssid)(const char *ifname, void *priv, u8 *buf, int len);
+ int (*hapd_get_ssid)(void *priv, u8 *buf, int len);
/**
* hapd_set_ssid - Set SSID (AP only)
- * @ifname: Interface (master or virtual BSS)
* @priv: Private driver interface data
* @buf: SSID
* @len: Length of the SSID in octets
* Returns: 0 on success, -1 on failure
*/
- int (*hapd_set_ssid)(const char *ifname, void *priv, const u8 *buf,
- int len);
+ int (*hapd_set_ssid)(void *priv, const u8 *buf, int len);
+
/**
* hapd_set_countermeasures - Enable/disable TKIP countermeasures (AP)
* @priv: Private driver interface data
diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index 63a6d22..ba21de3 100644
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -1148,7 +1148,7 @@ madwifi_deinit(void *priv)
}
static int
-madwifi_set_ssid(const char *ifname, void *priv, const u8 *buf, int len)
+madwifi_set_ssid(void *priv, const u8 *buf, int len)
{
struct madwifi_driver_data *drv = priv;
struct iwreq iwr;
@@ -1168,7 +1168,7 @@ madwifi_set_ssid(const char *ifname, void *priv, const u8 *buf, int len)
}
static int
-madwifi_get_ssid(const char *ifname, void *priv, u8 *buf, int len)
+madwifi_get_ssid(void *priv, u8 *buf, int len)
{
struct madwifi_driver_data *drv = priv;
struct iwreq iwr;
diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 92ef30c..941db51 100644
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -134,7 +134,7 @@ set80211param(struct bsd_driver_data *drv, int op, int arg)
}
static int
-bsd_get_ssid(const char *ifname, void *priv, u8 *ssid, int len)
+bsd_get_ssid(void *priv, u8 *ssid, int len)
{
struct bsd_driver_data *drv = priv;
#ifdef SIOCG80211NWID
@@ -155,7 +155,7 @@ bsd_get_ssid(const char *ifname, void *priv, u8 *ssid, int len)
}
static int
-bsd_set_ssid(const char *ifname, void *priv, const u8 *ssid, int ssid_len)
+bsd_set_ssid(void *priv, const u8 *ssid, int ssid_len)
{
struct bsd_driver_data *drv = priv;
#ifdef SIOCS80211NWID
diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index 05096b2..a0cd132 100644
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -550,8 +550,7 @@ static int hostap_set_privacy(void *priv, int enabled)
}
-static int hostap_set_ssid(const char *ifname, void *priv, const u8 *buf,
- int len)
+static int hostap_set_ssid(void *priv, const u8 *buf, int len)
{
struct hostap_driver_data *drv = priv;
struct iwreq iwr;
diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index d0acf34..40abdb5 100644
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -1218,7 +1218,7 @@ madwifi_deinit(void *priv)
}
static int
-madwifi_set_ssid(const char *ifname, void *priv, const u8 *buf, int len)
+madwifi_set_ssid(void *priv, const u8 *buf, int len)
{
struct madwifi_driver_data *drv = priv;
struct iwreq iwr;
@@ -1238,7 +1238,7 @@ madwifi_set_ssid(const char *ifname, void *priv, const u8 *buf, int len)
}
static int
-madwifi_get_ssid(const char *ifname, void *priv, u8 *buf, int len)
+madwifi_get_ssid(void *priv, u8 *buf, int len)
{
struct madwifi_driver_data *drv = priv;
struct iwreq iwr;
diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 2fa4108..e6b1f1f 100644
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -1043,12 +1043,11 @@ static int test_driver_valid_bss_mask(void *priv, const u8 *addr,
}
-static int test_driver_set_ssid(const char *ifname, void *priv, const u8 *buf,
- int len)
+static int test_driver_set_ssid(void *priv, const u8 *buf, int len)
{
struct test_driver_bss *bss = priv;
- wpa_printf(MSG_DEBUG, "%s(ifname=%s)", __func__, ifname);
+ wpa_printf(MSG_DEBUG, "%s(ifname=%s)", __func__, bss->ifname);
wpa_hexdump_ascii(MSG_DEBUG, "test_driver_set_ssid: SSID", buf, len);
if (len < 0 || (size_t) len > sizeof(bss->ssid))