aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-03-07 08:05:05 (GMT)
committerJouni Malinen <j@w1.fi>2010-03-07 08:05:05 (GMT)
commit7ab68865c03615be7a69daf219336a3c123b894c (patch)
treeb10e1762b268f7d9f936dcbe6fcf4caa245199cc /src
parent17557ebe30e00fe9775903d98e0170b4e8280bb0 (diff)
downloadhostap-7ab68865c03615be7a69daf219336a3c123b894c.zip
hostap-7ab68865c03615be7a69daf219336a3c123b894c.tar.gz
hostap-7ab68865c03615be7a69daf219336a3c123b894c.tar.bz2
Remove unneeded iface parameter from if_add() driver op
Diffstat (limited to 'src')
-rw-r--r--src/ap/ap_drv_ops.c4
-rw-r--r--src/drivers/driver.h7
-rw-r--r--src/drivers/driver_nl80211.c3
-rw-r--r--src/drivers/driver_test.c10
4 files changed, 11 insertions, 13 deletions
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index b7298dc..def8db8 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -412,8 +412,8 @@ int hostapd_if_add(struct hostapd_data *hapd, enum wpa_driver_if_type type,
{
if (hapd->driver == NULL || hapd->driver->if_add == NULL)
return -1;
- return hapd->driver->if_add(hapd->conf->iface, hapd->drv_priv, type,
- ifname, addr, bss_ctx, drv_priv);
+ return hapd->driver->if_add(hapd->drv_priv, type, ifname, addr,
+ bss_ctx, drv_priv);
}
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 453738e..3cab8f5 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1488,7 +1488,6 @@ struct wpa_driver_ops {
/**
* if_add - Add a virtual interface
- * @iface: Parent interface name
* @priv: Private driver interface data
* @type: Interface type
* @ifname: Interface name for the new virtual interface
@@ -1499,9 +1498,9 @@ struct wpa_driver_ops {
* not allowed (applies only to %WPA_IF_AP_BSS type)
* Returns: 0 on success, -1 on failure
*/
- int (*if_add)(const char *iface, void *priv,
- enum wpa_driver_if_type type, const char *ifname,
- const u8 *addr, void *bss_ctx, void **drv_priv);
+ int (*if_add)(void *priv, enum wpa_driver_if_type type,
+ const char *ifname, const u8 *addr, void *bss_ctx,
+ void **drv_priv);
/**
* if_remove - Remove a virtual interface
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index c5ab9e7..2841ffc 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -4683,8 +4683,7 @@ static enum nl80211_iftype wpa_driver_nl80211_if_type(
}
-static int wpa_driver_nl80211_if_add(const char *iface, void *priv,
- enum wpa_driver_if_type type,
+static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
const char *ifname, const u8 *addr,
void *bss_ctx, void **drv_priv)
{
diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 4f73c69..d5f45a9 100644
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -1028,12 +1028,12 @@ static int test_driver_bss_remove(void *priv, const char *ifname)
}
-static int test_driver_if_add(const char *iface, void *priv,
- enum wpa_driver_if_type type, const char *ifname,
- const u8 *addr, void *bss_ctx, void **drv_priv)
+static int test_driver_if_add(void *priv, enum wpa_driver_if_type type,
+ const char *ifname, const u8 *addr,
+ void *bss_ctx, void **drv_priv)
{
- wpa_printf(MSG_DEBUG, "%s(iface=%s type=%d ifname=%s bss_ctx=%p)",
- __func__, iface, type, ifname, bss_ctx);
+ wpa_printf(MSG_DEBUG, "%s(type=%d ifname=%s bss_ctx=%p)",
+ __func__, type, ifname, bss_ctx);
if (type == WPA_IF_AP_BSS)
return test_driver_bss_add(priv, ifname, addr, bss_ctx);
return 0;