staging: wfx: drop useless stricts only used in hif_req_start_scan_alt

The structs hif_scan_type, hif_scan_flags and hif_auto_scan_param have
no real reasons to exist (apart maybe defining namespaces). Moreover,
the names of the fields within these structs are not all meaningful.

Drop the structs and rename the fields.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-21-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 d5ef1118b87c63112dbe76e66d1c3e86c89e6d41..c7e6fdf183b129efc1b66c051469099529ab90d4 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -113,25 +113,6 @@ struct hif_cnf_update_ie {
        __le32 status;
 } __packed;
 
-struct hif_scan_type {
-       u8     type:1;
-       u8     mode:1;
-       u8     reserved:6;
-} __packed;
-
-struct hif_scan_flags {
-       u8     fbg:1;
-       u8     reserved1:1;
-       u8     pre:1;
-       u8     reserved2:5;
-} __packed;
-
-struct hif_auto_scan_param {
-       __le16 interval;
-       u8     reserved;
-       s8     rssi_thr;
-} __packed;
-
 struct hif_ssid_def {
        __le32 ssid_length;
        u8     ssid[HIF_API_SSID_SIZE];
@@ -142,10 +123,17 @@ struct hif_ssid_def {
 
 struct hif_req_start_scan_alt {
        u8     band;
-       struct hif_scan_type scan_type;
-       struct hif_scan_flags scan_flags;
+       u8     maintain_current_bss:1;
+       u8     periodic:1;
+       u8     reserved1:6;
+       u8     disallow_ps:1;
+       u8     reserved2:1;
+       u8     short_preamble:1;
+       u8     reserved3:5;
        u8     max_transmit_rate;
-       struct hif_auto_scan_param auto_scan_param;
+       __le16 periodic_interval;
+       u8     reserved4;
+       s8     periodic_rssi_thr;
        u8     num_of_probe_requests;
        u8     probe_delay;
        u8     num_of_ssids;

diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c
index 134af4daee9624c0ebe6f498f5530c42e0838e80..0553e79595a6bd7434f7f41dae98c1cf9a9eb59d 100644 (file)
--- a/drivers/staging/wfx/hif_tx.c
+++ b/drivers/staging/wfx/hif_tx.c
@@ -256,9 +256,8 @@ int hif_scan(struct wfx_vif *wvif, struct cfg80211_scan_request *req,
                        cpu_to_le32(req->ssids[i].ssid_len);
        }
        body->num_of_ssids = HIF_API_MAX_NB_SSIDS;
-       // Background scan is always a good idea
-       body->scan_type.type = 1;
-       body->scan_flags.fbg = 1;
+       body->maintain_current_bss = 1;
+       body->disallow_ps = 1;
        body->tx_power_level =
                cpu_to_le32(req->channels[chan_start_idx]->max_power);
        body->num_of_channels = chan_num;