aboutsummaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2019-05-20 07:55:07 (GMT)
committerJouni Malinen <j@w1.fi>2019-05-27 13:30:05 (GMT)
commitb04e43086ba36af7e18f36b47974db92e03a2bea (patch)
treee09eff3c570a1710a157ae95b4e5fd16585a455e /src/common
parent464dcfd0304caa92f61a612a2a39e3b38dd34f34 (diff)
downloadhostap-b04e43086ba36af7e18f36b47974db92e03a2bea.zip
hostap-b04e43086ba36af7e18f36b47974db92e03a2bea.tar.gz
hostap-b04e43086ba36af7e18f36b47974db92e03a2bea.tar.bz2
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>
Diffstat (limited to 'src/common')
-rw-r--r--src/common/hw_features_common.c8
-rw-r--r--src/common/hw_features_common.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common/hw_features_common.c b/src/common/hw_features_common.c
index 1df6296..aa430f2 100644
--- 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 eb1f1c5..d3efe77 100644
--- 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);