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

Remove unused parameters from set_rate_sets()

Browse source 
Only setting of the basic rate set was supported, so remove the
unused parameters.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-12-03 11:57:13 +02:00
parent e26cd1a180
commit 5f17b3ee9f
5 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ap/ap_drv_ops.c
View file

@ -475,13 +475,11 @@ int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
} }
int hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates, int hostapd_set_rate_sets(struct hostapd_data *hapd, int *basic_rates)
int *basic_rates, int mode)
{ {
if (hapd->driver == NULL || hapd->driver->set_rate_sets == NULL) if (hapd->driver == NULL || hapd->driver->set_rate_sets == NULL)
return 0; return 0;
return hapd->driver->set_rate_sets(hapd->drv_priv, supp_rates, return hapd->driver->set_rate_sets(hapd->drv_priv, basic_rates);
basic_rates, mode);
} }

3
src/ap/ap_drv_ops.h
View file

@ -66,8 +66,7 @@ int hostapd_set_rts(struct hostapd_data *hapd, int rts);
int hostapd_set_frag(struct hostapd_data *hapd, int frag); int hostapd_set_frag(struct hostapd_data *hapd, int frag);
int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr, int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
int total_flags, int flags_or, int flags_and); int total_flags, int flags_or, int flags_and);
int hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates, int hostapd_set_rate_sets(struct hostapd_data *hapd, int *basic_rates);
int *basic_rates, int mode);
int hostapd_set_country(struct hostapd_data *hapd, const char *country); int hostapd_set_country(struct hostapd_data *hapd, const char *country);
int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs, int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,
int cw_min, int cw_max, int burst_time); int cw_min, int cw_max, int burst_time);

3
src/ap/hw_features.c
View file

@ -126,8 +126,7 @@ int hostapd_prepare_rates(struct hostapd_data *hapd,
return -1; return -1;
} }
if (hostapd_set_rate_sets(hapd, hapd->iconf->supported_rates, if (hostapd_set_rate_sets(hapd, basic_rates)) {
basic_rates, mode->mode)) {
wpa_printf(MSG_ERROR, "Failed to update rate sets in kernel " wpa_printf(MSG_ERROR, "Failed to update rate sets in kernel "
"module"); "module");
} }

7
src/drivers/driver.h
View file

@ -1685,15 +1685,12 @@ struct wpa_driver_ops {
int total_flags, int flags_or, int flags_and); int total_flags, int flags_or, int flags_and);
/** /**
* set_rate_sets - Set supported and basic rate sets (AP only) * set_rate_sets - Set basic rate set (AP only)
* @priv: Private driver interface data * @priv: Private driver interface data
* @supp_rates: -1 terminated array of supported rates in 100 kbps
* @basic_rates: -1 terminated array of basic rates in 100 kbps * @basic_rates: -1 terminated array of basic rates in 100 kbps
* @mode: hardware mode (HOSTAPD_MODE_*)
* Returns: 0 on success, -1 on failure * Returns: 0 on success, -1 on failure
*/ */
int (*set_rate_sets)(void *priv, int *supp_rates, int *basic_rates, int (*set_rate_sets)(void *priv, int *basic_rates);
int mode);
/** /**
* set_tx_queue_params - Set TX queue parameters * set_tx_queue_params - Set TX queue parameters

3
src/drivers/driver_nl80211.c
View file

@ -6017,8 +6017,7 @@ static int i802_get_seqnum(const char *iface, void *priv, const u8 *addr,
} }
static int i802_set_rate_sets(void *priv, int *supp_rates, int *basic_rates, static int i802_set_rate_sets(void *priv, int *basic_rates)
int mode)
{ {
struct i802_bss *bss = priv; struct i802_bss *bss = priv;
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;