staging: wfx: drop useless struct hif_rx_flags

Struct hif_rx_flags has no reason to exist. Drop it and simplify access
to struct hif_ind_rx.

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

diff --git a/drivers/staging/wfx/data_rx.c b/drivers/staging/wfx/data_rx.c
index 7fcbbfc534165cb5fec052f025be4b7158914c2f..fe111d0aab63dfa7751b878de1341838371401c3 100644 (file)
--- a/drivers/staging/wfx/data_rx.c
+++ b/drivers/staging/wfx/data_rx.c
@@ -70,7 +70,7 @@ void wfx_rx_cb(struct wfx_vif *wvif,
        hdr->signal = arg->rcpi_rssi / 2 - 110;
        hdr->antenna = 0;
 
-       if (arg->rx_flags.encryp)
+       if (arg->encryp)
                hdr->flag |= RX_FLAG_DECRYPTED;
 
        // Block ack negotiation is offloaded by the firmware. However,

diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h
index 6ecb23ceaf8cdfb9049c97cc21d61ac04ed863b8..3a60bdf286f33b3191bc5d7d7fb5a77dad36f835 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -283,7 +283,12 @@ enum hif_ri_flags_encrypt {
        HIF_RI_FLAGS_WAPI_ENCRYPTED                = 0x4
 };
 
-struct hif_rx_flags {
+struct hif_ind_rx {
+       __le32 status;
+       u8     channel_number;
+       u8     reserved1;
+       u8     rxed_rate;
+       u8     rcpi_rssi;
        u8     encryp:3;
        u8     in_aggr:1;
        u8     first_aggr:1;
@@ -295,7 +300,7 @@ struct hif_rx_flags {
        u8     match_ssid:1;
        u8     match_bssid:1;
        u8     more:1;
-       u8     reserved1:1;
+       u8     reserved2:1;
        u8     ht:1;
        u8     stbc:1;
        u8     match_uc_addr:1;
@@ -303,23 +308,13 @@ struct hif_rx_flags {
        u8     match_bc_addr:1;
        u8     key_type:1;
        u8     key_index:4;
-       u8     reserved2:1;
+       u8     reserved3:1;
        u8     peer_sta_id:4;
-       u8     reserved3:2;
-       u8     reserved4:1;
-} __packed;
-
-struct hif_ind_rx {
-       __le32 status;
-       u8     channel_number;
-       u8     reserved;
-       u8     rxed_rate;
-       u8     rcpi_rssi;
-       struct hif_rx_flags rx_flags;
+       u8     reserved4:2;
+       u8     reserved5:1;
        u8     frame[];
 } __packed;
 
-
 struct hif_req_edca_queue_params {
        u8     queue_id;
        u8     reserved1;