[PATCH 28/55] staging: wfx: better naming for hif_mib_set_association_mode->greenfield

Jérôme Pouiller
2019-12-16T17:06:17Z

Current name "mixed_or_greenfield_type" does not allow to know if
"true" means "mixed" of "greenfield". It is possible to use a better
name and drop "enum hif_tx_mode".

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
drivers/staging/wfx/hif_api_mib.h | 8 ++------
drivers/staging/wfx/sta.c | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h
index 34e4310ad71f..1603b3074bf7 100644
--- a/drivers/staging/wfx/hif_api_mib.h
+++ b/drivers/staging/wfx/hif_api_mib.h
@@ -395,11 +395,6 @@ struct hif_mib_non_erp_protection {
u8 reserved2[3];
} __packed;

-enum hif_tx_mode {
- HIF_TX_MODE_MIXED = 0x0,
- HIF_TX_MODE_GREENFIELD = 0x1
-};
-
enum hif_tmplt {
HIF_TMPLT_PRBREQ = 0x0,
HIF_TMPLT_BCN = 0x1,
@@ -474,7 +469,8 @@ struct hif_mib_set_association_mode {
u8 reserved1:4;
u8 short_preamble:1;
u8 reserved2:7;
- u8 mixed_or_greenfield_type;
+ u8 greenfield:1;
+ u8 reserved3:7;
u8 mpdu_start_spacing;
u32 basic_rate_set;
} __packed;
diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index e5c933678c47..939c64f108ed 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -996,7 +996,7 @@ static void wfx_join_finalize(struct wfx_vif *wvif,
association_mode.spacing = 1;
association_mode.short_preamble = info->use_short_preamble;
association_mode.basic_rate_set = cpu_to_le32(wfx_rate_mask_to_hw(wvif->wdev, info->basic_rates));
- association_mode.mixed_or_greenfield_type = wfx_ht_greenfield(&wvif->ht_info);
+ association_mode.greenfield = wfx_ht_greenfield(&wvif->ht_info);
association_mode.mpdu_start_spacing = wfx_ht_ampdu_density(&wvif->ht_info);

wfx_cqm_bssloss_sm(wvif, 0, 0, 0);
--
2.20.1