diff options
author | Jouni Malinen <jouni.malinen@atheros.com> | 2009-11-23 15:26:05 +0200 |
---|---|---|
committer | Jouni Malinen <j@w1.fi> | 2009-11-23 15:26:05 +0200 |
commit | 5d67487244cbfddf6b808929ec3c8f728ef231a6 (patch) | |
tree | a11e1322f4202e1d534b5ec2d26196632561ee8a /wpa_supplicant/ap.c | |
parent | 224f7bda793010087833899a5b203ac80a05b208 (diff) | |
download | external_wpa_supplicant_8_ti-5d67487244cbfddf6b808929ec3c8f728ef231a6.zip external_wpa_supplicant_8_ti-5d67487244cbfddf6b808929ec3c8f728ef231a6.tar.gz external_wpa_supplicant_8_ti-5d67487244cbfddf6b808929ec3c8f728ef231a6.tar.bz2 |
Merge set_beacon driver_ops into a single one
Clean up driver interface by merging hostapd and wpa_supplicant
specific set_beacon driver_ops into a single one. In addition,
merge set_beacon_int into to the same operation.
Diffstat (limited to 'wpa_supplicant/ap.c')
-rw-r--r-- | wpa_supplicant/ap.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index a2c9e5a..b41de0a 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -196,20 +196,12 @@ static int ap_driver_set_freq(void *priv, struct hostapd_freq_params *freq) static int ap_driver_set_beacon(const char *iface, void *priv, const u8 *head, size_t head_len, const u8 *tail, size_t tail_len, - int dtim_period) + int dtim_period, int beacon_int) { struct ap_driver_data *drv = priv; struct wpa_supplicant *wpa_s = drv->hapd->iface->owner; return wpa_drv_set_beacon(wpa_s, head, head_len, tail, tail_len, - dtim_period); -} - - -static int ap_driver_set_beacon_int(void *priv, int value) -{ - struct ap_driver_data *drv = priv; - struct wpa_supplicant *wpa_s = drv->hapd->iface->owner; - return wpa_drv_set_beacon_int(wpa_s, value); + dtim_period, beacon_int); } @@ -282,8 +274,7 @@ struct wpa_driver_ops ap_driver_ops = .sta_add = ap_driver_sta_add, .get_inact_sec = ap_driver_get_inact_sec, .set_freq = ap_driver_set_freq, - .hapd_set_beacon = ap_driver_set_beacon, - .set_beacon_int = ap_driver_set_beacon_int, + .set_beacon = ap_driver_set_beacon, .set_cts_protect = ap_driver_set_cts_protect, .set_preamble = ap_driver_set_preamble, .set_short_slot_time = ap_driver_set_short_slot_time, |