staging: wfx: improve API of hif_req_join->infrastructure_bss_mode

In fact "mode" is a boolean that indicates if IBSS mode is used. This
patch fixes the name and uses a more adapted memory representation.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191217161318.31402-27-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h
index 4ce3bb5..e848bd3 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -377,11 +377,6 @@ struct hif_cnf_edca_queue_params {
        u32   status;
 } __packed;
 
-enum hif_ap_mode {
-       HIF_MODE_IBSS                              = 0x0,
-       HIF_MODE_BSS                               = 0x1
-};
-
 enum hif_preamble {
        HIF_PREAMBLE_LONG                          = 0x0,
        HIF_PREAMBLE_SHORT                         = 0x1,
@@ -396,7 +391,8 @@ struct hif_join_flags {
 } __packed;
 
 struct hif_req_join {
-       u8    mode;
+       u8    infrastructure_bss_mode:1;
+       u8    reserved1:7;
        u8    band;
        u16   channel_number;
        u8    bssid[ETH_ALEN];

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index b4bb5b6..23ec7a4 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -651,7 +651,7 @@ static void wfx_do_join(struct wfx_vif *wvif)
        struct ieee80211_bss_conf *conf = &wvif->vif->bss_conf;
        struct cfg80211_bss *bss = NULL;
        struct hif_req_join join = {
-               .mode = conf->ibss_joined ? HIF_MODE_IBSS : HIF_MODE_BSS,
+               .infrastructure_bss_mode = !conf->ibss_joined,
                .preamble_type = conf->use_short_preamble ? HIF_PREAMBLE_SHORT : HIF_PREAMBLE_LONG,
                .probe_for_join = 1,
                .atim_window = 0,