DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove unnecessary ifname parameter from set_ap_wps_ie() driver op

Browse source
This commit is contained in:
Jouni Malinen 2010-03-07 11:51:50 +02:00
parent d3e3a20565
commit 0ebdf62735
6 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ap/ap_drv_ops.c
View file

@ -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) if (hapd->driver == NULL || hapd->driver->set_ap_wps_ie == NULL)
return 0; return 0;
return hapd->driver->set_ap_wps_ie(hapd->conf->iface, hapd->drv_priv, return hapd->driver->set_ap_wps_ie(hapd->drv_priv, beacon, proberesp);
beacon, proberesp);
} }

4
src/drivers/driver.h
View file

@ -1581,7 +1581,6 @@ struct wpa_driver_ops {
/** /**
* set_ap_wps_ie - Add WPS IE into Beacon/Probe Response frames (AP) * 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 * @priv: Private driver interface data
* @beacon: WPS IE for Beacon frames * @beacon: WPS IE for Beacon frames
* @proberesp: WPS IE for Probe Response 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() * to %NULL) if the driver uses the Beacon template from set_beacon()
* and does not process Probe Request frames. * and does not process Probe Request frames.
*/ */
int (*set_ap_wps_ie)(const char *ifname, void *priv, int (*set_ap_wps_ie)(void *priv, const struct wpabuf *beacon,
const struct wpabuf *beacon,
const struct wpabuf *proberesp); const struct wpabuf *proberesp);
/** /**

3
src/drivers/driver_atheros.c
View file

@ -683,8 +683,7 @@ madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
} }
static int static int
madwifi_set_ap_wps_ie(const char *ifname, void *priv, madwifi_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *beacon,
const struct wpabuf *proberesp) const struct wpabuf *proberesp)
{ {
if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL, if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL,

3
src/drivers/driver_hostap.c
View file

@ -762,8 +762,7 @@ static int hostap_set_generic_elem(void *priv,
} }
static int hostap_set_ap_wps_ie(const char *ifname, void *priv, static int hostap_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *beacon,
const struct wpabuf *proberesp) const struct wpabuf *proberesp)
{ {
struct hostap_driver_data *drv = priv; struct hostap_driver_data *drv = priv;

3
src/drivers/driver_madwifi.c
View file

@ -786,8 +786,7 @@ madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
} }
static int static int
madwifi_set_ap_wps_ie(const char *ifname, void *priv, madwifi_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *beacon,
const struct wpabuf *proberesp) const struct wpabuf *proberesp)
{ {
if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL, if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL,

3
src/drivers/driver_test.c
View file

@ -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, static int test_driver_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *beacon,
const struct wpabuf *proberesp) const struct wpabuf *proberesp)
{ {
struct test_driver_bss *bss = priv; struct test_driver_bss *bss = priv;