Browse Source

Remove unneeded iface parameter from if_add() driver op

Jouni Malinen 15 years ago
parent
commit
7ab68865c0
4 changed files with 11 additions and 13 deletions
  1. 2 2
      src/ap/ap_drv_ops.c
  2. 3 4
      src/drivers/driver.h
  3. 1 2
      src/drivers/driver_nl80211.c
  4. 5 5
      src/drivers/driver_test.c

+ 2 - 2
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);
 }
 
 

+ 3 - 4
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

+ 1 - 2
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)
 {

+ 5 - 5
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;