Remove unnecessary ifname parameter from set_ap_wps_ie() driver op

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index d79c6982920e5725000cf7ea68642f5a472cfb7a..a5978c6f4980234f50ed2b4ef6fde56a2e0acc99 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -44,8 +44,7 @@ static int hostapd_set_ap_wps_ie(struct hostapd_data *hapd,
 {
        if (hapd->driver == NULL || hapd->driver->set_ap_wps_ie == NULL)
                return 0;
-       return hapd->driver->set_ap_wps_ie(hapd->conf->iface, hapd->drv_priv,
-                                          beacon, proberesp);
+       return hapd->driver->set_ap_wps_ie(hapd->drv_priv, beacon, proberesp);
 }
 
 

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 188f34ce34322977214870297b0b28e46bbce24c..df35e5f8fa85dd9de6c11476575c463c5ede1cd7 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1581,7 +1581,6 @@ struct wpa_driver_ops {
 
        /**
         * set_ap_wps_ie - Add WPS IE into Beacon/Probe Response frames (AP)
-        * @ifname: The interface name (main or virtual BSS)
         * @priv: Private driver interface data
         * @beacon: WPS IE for Beacon frames
         * @proberesp: WPS IE for Probe Response frames
@@ -1592,8 +1591,7 @@ struct wpa_driver_ops {
         * to %NULL) if the driver uses the Beacon template from set_beacon()
         * and does not process Probe Request frames.
         */
-       int (*set_ap_wps_ie)(const char *ifname, void *priv,
-                            const struct wpabuf *beacon,
+       int (*set_ap_wps_ie)(void *priv, const struct wpabuf *beacon,
                             const struct wpabuf *proberesp);
 
        /**

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index 2b45f66af58afb455575db372772848ef7003fc4..f718857b75f4f4d7964a981d50d6b24fe040676c 100644 (file)
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -683,8 +683,7 @@ madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
 }
 
 static int
-madwifi_set_ap_wps_ie(const char *ifname, void *priv,
-                     const struct wpabuf *beacon,
+madwifi_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
                      const struct wpabuf *proberesp)
 {
        if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL,

diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index b568bfd1dd04e8d8473609b087a301ae089ad099..952f3891abdeb92afe90e5fc2515d83610014087 100644 (file)
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -762,8 +762,7 @@ static int hostap_set_generic_elem(void *priv,
 }
 
 
-static int hostap_set_ap_wps_ie(const char *ifname, void *priv,
-                               const struct wpabuf *beacon,
+static int hostap_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
                                const struct wpabuf *proberesp)
 {
        struct hostap_driver_data *drv = priv;

diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index 08ca54fc5a5c2469e6ca4f4112ca923ea70c51e3..8687404db9026fc630f5b0d396432095d4cfaea2 100644 (file)
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -786,8 +786,7 @@ madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
 }
 
 static int
-madwifi_set_ap_wps_ie(const char *ifname, void *priv,
-                     const struct wpabuf *beacon,
+madwifi_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
                      const struct wpabuf *proberesp)
 {
        if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL,

diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 9cd36ba5358f15b3a9cc836921885b10bbbdaf36..4a57b3039f33562edf4df27adcd210eaef4420d9 100644 (file)
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -840,8 +840,7 @@ static int test_driver_set_generic_elem(void *priv,
 }
 
 
-static int test_driver_set_ap_wps_ie(const char *ifname, void *priv,
-                                    const struct wpabuf *beacon,
+static int test_driver_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
                                     const struct wpabuf *proberesp)
 {
        struct test_driver_bss *bss = priv;