staging: wfx: drop useless struct hif_tx_result_flags

Struct hif_tx_result_flags has no reason to exist. Drop it and simplify
access to struct hif_cnf_tx.

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

diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c
index 485907b..1f2158d 100644 (file)
--- a/drivers/staging/wfx/data_tx.c
+++ b/drivers/staging/wfx/data_tx.c
@@ -518,8 +518,7 @@ void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct hif_cnf_tx *arg)
                else
                        tx_info->flags |= IEEE80211_TX_STAT_ACK;
        } else if (arg->status == HIF_STATUS_TX_FAIL_REQUEUE) {
-               WARN(!arg->tx_result_flags.requeue,
-                    "incoherent status and result_flags");
+               WARN(!arg->requeue, "incoherent status and result_flags");
                if (tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) {
                        wvif->after_dtim_tx_allowed = false; // DTIM period elapsed
                        schedule_work(&wvif->update_tim_work);

diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h
index 3a60bdf..b86ec39 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -248,15 +248,6 @@ enum hif_qos_ackplcy {
        HIF_QOS_ACKPLCY_BLCKACK                        = 0x3
 };
 
-struct hif_tx_result_flags {
-       u8     aggr:1;
-       u8     requeue:1;
-       u8     ack_policy:2;
-       u8     txop_limit:1;
-       u8     reserved1:3;
-       u8     reserved2;
-} __packed;
-
 struct hif_cnf_tx {
        __le32 status;
        // packet_id is copied from struct hif_req_tx without been interpreted
@@ -264,7 +255,12 @@ struct hif_cnf_tx {
        u32    packet_id;
        u8     txed_rate;
        u8     ack_failures;
-       struct hif_tx_result_flags tx_result_flags;
+       u8     aggr:1;
+       u8     requeue:1;
+       u8     ack_policy:2;
+       u8     txop_limit:1;
+       u8     reserved1:3;
+       u8     reserved2;
        __le32 media_delay;
        __le32 tx_queue_delay;
 } __packed;