Remove unnecessary ifname parameter from set_ht_params() driver op

src/ap/ap_drv_ops.c

@@ -186,8 +186,7 @@ static int hostapd_set_bss_params(struct hostapd_data *hapd,
 	ht_oper = pos;
 	pos = hostapd_eid_ht_operation(hapd, pos);
 	if (pos > ht_oper && ht_oper > ht_capab &&
-	    hostapd_set_ht_params(hapd->conf->iface, hapd,
-				  ht_capab + 2, ht_capab[1],
+	    hostapd_set_ht_params(hapd, ht_capab + 2, ht_capab[1],
 				  ht_oper + 2, ht_oper[1])) {
 		wpa_printf(MSG_ERROR, "Could not set HT capabilities "
 			   "for kernel driver");
@@ -574,16 +573,16 @@ int hostapd_driver_commit(struct hostapd_data *hapd)
 }
 
 
-int hostapd_set_ht_params(const char *ifname, struct hostapd_data *hapd,
+int hostapd_set_ht_params(struct hostapd_data *hapd,
 			  const u8 *ht_capab, size_t ht_capab_len,
 			  const u8 *ht_oper, size_t ht_oper_len)
 {
 	if (hapd->driver == NULL || hapd->driver->set_ht_params == NULL ||
 	    ht_capab == NULL || ht_oper == NULL)
 		return 0;
-	return hapd->driver->set_ht_params(
-		ifname, hapd->drv_priv, ht_capab, ht_capab_len,
-		ht_oper, ht_oper_len);
+	return hapd->driver->set_ht_params(hapd->drv_priv,
+					   ht_capab, ht_capab_len,
+					   ht_oper, ht_oper_len);
 }
 
 

src/ap/ap_drv_ops.h

@@ -55,7 +55,7 @@ struct hostapd_hw_modes *
 hostapd_get_hw_feature_data(struct hostapd_data *hapd, u16 *num_modes,
 			    u16 *flags);
 int hostapd_driver_commit(struct hostapd_data *hapd);
-int hostapd_set_ht_params(const char *ifname, struct hostapd_data *hapd,
+int hostapd_set_ht_params(struct hostapd_data *hapd,
 			  const u8 *ht_capab, size_t ht_capab_len,
 			  const u8 *ht_oper, size_t ht_oper_len);
 int hostapd_drv_none(struct hostapd_data *hapd);

src/drivers/driver.h

@@ -1568,7 +1568,6 @@ struct wpa_driver_ops {
 
 	/**
 	 * set_ht_params - Set HT parameters (AP only)
-	 * @ifname: The interface name (main or virtual BSS)
 	 * @priv: Private driver interface data
 	 * @ht_capab: HT Capabilities IE
 	 * @ht_capab_len: Length of ht_capab in octets
@@ -1576,7 +1575,7 @@ struct wpa_driver_ops {
 	 * @ht_oper_len: Length of ht_oper in octets
 	 * Returns: 0 on success, -1 on failure
 	 */
-	int (*set_ht_params)(const char *ifname, void *priv,
+	int (*set_ht_params)(void *priv,
 			     const u8 *ht_capab, size_t ht_capab_len,
 			     const u8 *ht_oper, size_t ht_oper_len);