From: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>
Struct hif_ie_flags has no reason to exist. Drop it and simplify
access to struct hif_req_update_ie.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>
---
drivers/staging/wfx/hif_api_cmd.h | 14 +++++---------
drivers/staging/wfx/hif_tx.c | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h
index 3da736dbf52c..b104abbc5b25 100644
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -93,14 +93,6 @@ struct hif_cnf_write_mib {
__le32 status;
} __packed;
-struct hif_ie_flags {
- u8 beacon:1;
- u8 probe_resp:1;
- u8 probe_req:1;
- u8 reserved1:5;
- u8 reserved2;
-} __packed;
-
struct hif_ie_tlv {
u8 type;
u8 length;
@@ -108,7 +100,11 @@ struct hif_ie_tlv {
} __packed;
struct hif_req_update_ie {
- struct hif_ie_flags ie_flags;
+ u8 beacon:1;
+ u8 probe_resp:1;
+ u8 probe_req:1;
+ u8 reserved1:5;
+ u8 reserved2;
__le16 num_ies;
struct hif_ie_tlv ie[];
} __packed;
diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c
index 8736eb4d5f15..49523e70af6c 100644
--- a/drivers/staging/wfx/hif_tx.c
+++ b/drivers/staging/wfx/hif_tx.c
@@ -520,7 +520,7 @@ int hif_update_ie_beacon(struct wfx_vif *wvif, const u8 *ies, size_t ies_len)
if (!hif)
return -ENOMEM;
- body->ie_flags.beacon = 1;
+ body->beacon = 1;
body->num_ies = cpu_to_le16(1);
memcpy(body->ie, ies, ies_len);
wfx_fill_header(hif, wvif->id, HIF_REQ_ID_UPDATE_IE, buf_len);
--
2.28.0
