Remove unused parameters from set_rate_sets()

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

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index 77d647b82d00e60c5c659e3164bb2aa8ab63cb95..484db59ccd700844ccaaee96e825ecfc57b0939f 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -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 *basic_rates, int mode)
+int hostapd_set_rate_sets(struct hostapd_data *hapd, int *basic_rates)
 {
        if (hapd->driver == NULL || hapd->driver->set_rate_sets == NULL)
                return 0;
-       return hapd->driver->set_rate_sets(hapd->drv_priv, supp_rates,
-                                          basic_rates, mode);
+       return hapd->driver->set_rate_sets(hapd->drv_priv, basic_rates);
 }
 
 

diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
index c918a4afbfe7811cb7ed86447652b95e286b28b0..7f8e83a161e84602fa675837ec4a2434d25e2fd8 100644 (file)
--- a/src/ap/ap_drv_ops.h
+++ b/src/ap/ap_drv_ops.h
@@ -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_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
                          int total_flags, int flags_or, int flags_and);
-int hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates,
-                         int *basic_rates, int mode);
+int hostapd_set_rate_sets(struct hostapd_data *hapd, int *basic_rates);
 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 cw_min, int cw_max, int burst_time);

diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index e7235434369178adc9a06e0625e93e48f9a1d198..d46e74e39c31b4458bc0ba1090cf55bf90bf5e19 100644 (file)
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -126,8 +126,7 @@ int hostapd_prepare_rates(struct hostapd_data *hapd,
                return -1;
        }
 
-       if (hostapd_set_rate_sets(hapd, hapd->iconf->supported_rates,
-                                 basic_rates, mode->mode)) {
+       if (hostapd_set_rate_sets(hapd, basic_rates)) {
                wpa_printf(MSG_ERROR, "Failed to update rate sets in kernel "
                           "module");
        }

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index e3cfebe0ed9e034beca20768e207ffe440b72f64..816377b858eb99826ee6523e0d11957b3562dcf7 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1685,15 +1685,12 @@ struct wpa_driver_ops {
                             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
-        * @supp_rates: -1 terminated array of supported 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
         */
-       int (*set_rate_sets)(void *priv, int *supp_rates, int *basic_rates,
-                            int mode);
+       int (*set_rate_sets)(void *priv, int *basic_rates);
 
        /**
         * set_tx_queue_params - Set TX queue parameters

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 2abd11fbe61444bdc155d393786d76af66800351..d5be4b841e030456e0731f1b62ddd1f6fda2425e 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -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,
-                             int mode)
+static int i802_set_rate_sets(void *priv, int *basic_rates)
 {
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;