HE: Remove vht_ prefix from shared set_freq argument

oper_chwidth is used for both VHT and HE here.

Signed-off-by: Shashidhar Lakkavalli <slakkavalli@datto.com>
Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index f353756c14162e0d3838968762a3e743fccf9b04..8cfd659ac6f677a0ff652ae10a0bbcee89cf17e0 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -537,14 +537,14 @@ int hostapd_flush(struct hostapd_data *hapd)
 
 int hostapd_set_freq(struct hostapd_data *hapd, enum hostapd_hw_mode mode,
                     int freq, int channel, int ht_enabled, int vht_enabled,
-                    int sec_channel_offset, int vht_oper_chwidth,
+                    int sec_channel_offset, int oper_chwidth,
                     int center_segment0, int center_segment1)
 {
        struct hostapd_freq_params data;
 
        if (hostapd_set_freq_params(&data, mode, freq, channel, ht_enabled,
                                    vht_enabled, sec_channel_offset,
-                                   vht_oper_chwidth,
+                                   oper_chwidth,
                                    center_segment0, center_segment1,
                                    hapd->iface->current_mode ?
                                    hapd->iface->current_mode->vht_capab : 0))
@@ -785,7 +785,7 @@ int hostapd_drv_send_action_addr3_ap(struct hostapd_data *hapd,
 int hostapd_start_dfs_cac(struct hostapd_iface *iface,
                          enum hostapd_hw_mode mode, int freq,
                          int channel, int ht_enabled, int vht_enabled,
-                         int sec_channel_offset, int vht_oper_chwidth,
+                         int sec_channel_offset, int oper_chwidth,
                          int center_segment0, int center_segment1)
 {
        struct hostapd_data *hapd = iface->bss[0];
@@ -803,7 +803,7 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface,
 
        if (hostapd_set_freq_params(&data, mode, freq, channel, ht_enabled,
                                    vht_enabled, sec_channel_offset,
-                                   vht_oper_chwidth, center_segment0,
+                                   oper_chwidth, center_segment0,
                                    center_segment1,
                                    iface->current_mode->vht_capab)) {
                wpa_printf(MSG_ERROR, "Can't set freq params");

diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
index 5905be05376c8e9f1641ff540e44ba3b7f8cd37b..8758ec1046466a7f4356a706b918619153a28e1a 100644 (file)
--- a/src/ap/ap_drv_ops.h
+++ b/src/ap/ap_drv_ops.h
@@ -61,7 +61,7 @@ int hostapd_get_seqnum(const char *ifname, struct hostapd_data *hapd,
 int hostapd_flush(struct hostapd_data *hapd);
 int hostapd_set_freq(struct hostapd_data *hapd, enum hostapd_hw_mode mode,
                     int freq, int channel, int ht_enabled, int vht_enabled,
-                    int sec_channel_offset, int vht_oper_chwidth,
+                    int sec_channel_offset, int oper_chwidth,
                     int center_segment0, int center_segment1);
 int hostapd_set_rts(struct hostapd_data *hapd, int rts);
 int hostapd_set_frag(struct hostapd_data *hapd, int frag);
@@ -124,7 +124,7 @@ int hostapd_add_tspec(struct hostapd_data *hapd, const u8 *addr,
 int hostapd_start_dfs_cac(struct hostapd_iface *iface,
                          enum hostapd_hw_mode mode, int freq,
                          int channel, int ht_enabled, int vht_enabled,
-                         int sec_channel_offset, int vht_oper_chwidth,
+                         int sec_channel_offset, int oper_chwidth,
                          int center_segment0, int center_segment1);
 int hostapd_drv_do_acs(struct hostapd_data *hapd);
 

diff --git a/src/common/hw_features_common.c b/src/common/hw_features_common.c
index 1df62962bb6c3ba5f5c0faadd60963d8ecdf905a..aa430f2e24200fca428f28a0ce34210704f6e1d0 100644 (file)
--- a/src/common/hw_features_common.c
+++ b/src/common/hw_features_common.c
@@ -362,7 +362,7 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
                            enum hostapd_hw_mode mode,
                            int freq, int channel, int ht_enabled,
                            int vht_enabled, int sec_channel_offset,
-                           int vht_oper_chwidth, int center_segment0,
+                           int oper_chwidth, int center_segment0,
                            int center_segment1, u32 vht_caps)
 {
        os_memset(data, 0, sizeof(*data));
@@ -376,7 +376,7 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
        data->center_freq2 = 0;
        data->bandwidth = sec_channel_offset ? 40 : 20;
 
-       if (data->vht_enabled) switch (vht_oper_chwidth) {
+       if (data->vht_enabled) switch (oper_chwidth) {
        case CHANWIDTH_USE_HT:
                if (center_segment1 ||
                    (center_segment0 != 0 &&
@@ -397,9 +397,9 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
                /* fall through */
        case CHANWIDTH_80MHZ:
                data->bandwidth = 80;
-               if ((vht_oper_chwidth == CHANWIDTH_80MHZ &&
+               if ((oper_chwidth == CHANWIDTH_80MHZ &&
                     center_segment1) ||
-                   (vht_oper_chwidth == CHANWIDTH_80P80MHZ &&
+                   (oper_chwidth == CHANWIDTH_80P80MHZ &&
                     !center_segment1) ||
                    !sec_channel_offset)
                        return -1;

diff --git a/src/common/hw_features_common.h b/src/common/hw_features_common.h
index eb1f1c57f10f55c3f81f7227a50ed7f9b8ce1d84..d3efe77f281df2b04705aa05411787dde4c23c1e 100644 (file)
--- a/src/common/hw_features_common.h
+++ b/src/common/hw_features_common.h
@@ -33,7 +33,7 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
                            enum hostapd_hw_mode mode,
                            int freq, int channel, int ht_enabled,
                            int vht_enabled, int sec_channel_offset,
-                           int vht_oper_chwidth, int center_segment0,
+                           int oper_chwidth, int center_segment0,
                            int center_segment1, u32 vht_caps);
 void set_disable_ht40(struct ieee80211_ht_capabilities *htcaps,
                      int disabled);