staging: wfx: drop useless struct hif_join_flags

Struct hif_join_flags has no reason to exist. Drop it and simplify
access to struct hif_req_join.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-13-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 b104abbc5b258e83f00709441f05f18df7b365e0..1c99431eb90fbb08dd892a67f62d2b4632a38437 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -336,26 +336,22 @@ struct hif_cnf_edca_queue_params {
        __le32 status;
 } __packed;
 
-struct hif_join_flags {
-       u8     reserved1:2;
-       u8     force_no_beacon:1;
-       u8     force_with_ind:1;
-       u8     reserved2:4;
-} __packed;
-
 struct hif_req_join {
        u8     infrastructure_bss_mode:1;
        u8     reserved1:7;
        u8     band;
        u8     channel_number;
-       u8     reserved;
+       u8     reserved2;
        u8     bssid[ETH_ALEN];
        __le16 atim_window;
        u8     short_preamble:1;
-       u8     reserved2:7;
+       u8     reserved3:7;
        u8     probe_for_join;
-       u8     reserved3;
-       struct hif_join_flags join_flags;
+       u8     reserved4;
+       u8     reserved5:2;
+       u8     force_no_beacon:1;
+       u8     force_with_ind:1;
+       u8     reserved6:4;
        __le32 ssid_length;
        u8     ssid[HIF_API_SSID_SIZE];
        __le32 beacon_interval;