Add driver wrapper callback for WPS push button pressed

This avoids the need to include ../hostapd/wps_hostapd.h into the
driver wrappers.

diff --git a/hostapd/drv_callbacks.c b/hostapd/drv_callbacks.c
index f5eed1ccca6f20022e9a2b3aad08a7ca5d299dba..a7b7571dfffd548cb0f24932f4f3670d81b4ed06 100644 (file)
--- a/hostapd/drv_callbacks.c
+++ b/hostapd/drv_callbacks.c
@@ -461,3 +461,9 @@ void hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa,
                hapd->probereq_cb[i].cb(hapd->probereq_cb[i].ctx,
                                        sa, ie, ie_len);
 }
+
+
+void hostapd_button_pushed(struct hostapd_data *hapd)
+{
+       hostapd_wps_button_pushed(hapd);
+}

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 4b864e16dc9e382930169827413048e5714d3bf4..a605f1265e04c519f2765fa222d8b7a50fbf70e3 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1597,5 +1597,6 @@ struct hostapd_data * hostapd_sta_get_bss(struct hostapd_data *hapd,
                                          const u8 *addr);
 void hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa,
                          const u8 *ie, size_t ie_len);
+void hostapd_button_pushed(struct hostapd_data *hapd);
 
 #endif /* DRIVER_H */

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index 3e1342a5528d61d28d5eeb3861d138c7323b1206..1de3a71e3a09e2ebdaaf241562be2f9802929869 100644 (file)
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -65,8 +65,6 @@
 #include "eloop.h"
 #include "priv_netlink.h"
 #include "l2_packet/l2_packet.h"
-
-#include "../hostapd/wps_hostapd.h"
 #include "common/ieee802_11_defs.h"
 
 
@@ -849,7 +847,7 @@ madwifi_wireless_event_wireless_custom(struct madwifi_driver_data *drv,
                /* PROBLEM! this event is received for ALL BSSs ...
                 * so all are enabled for WPS... ugh.
                 */
-               hostapd_wps_button_pushed(drv->hapd);
+               hostapd_button_pushed(drv->hapd);
        } else if (strncmp(custom, "Manage.prob_req ", 16) == 0) {
                /*
                 * Atheros driver uses a hack to pass Probe Request frames as a