[PATCH 25/31] staging: wfx: drop struct hif_ie_tlv

From: Jerome Pouiller
Date: Mon Sep 07 2020 - 06:18:23 EST


From: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>

This struct hif_ie_tlv is definitively an Information Element (IE). This
struct is defined by 802.11 specification and already exists in
mac80211. Reuse this definition instead of struct hif_ie_tlv.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>
---
drivers/staging/wfx/hif_api_cmd.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h
index c18e762485a9..ef5483609dcb 100644
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -8,6 +8,8 @@
#ifndef WFX_HIF_API_CMD_H
#define WFX_HIF_API_CMD_H

+#include <linux/ieee80211.h>
+
#include "hif_api_general.h"

#define HIF_API_SSID_SIZE API_SSID_SIZE
@@ -93,12 +95,6 @@ struct hif_cnf_write_mib {
__le32 status;
} __packed;

-struct hif_ie_tlv {
- u8 type;
- u8 length;
- u8 data[];
-} __packed;
-
struct hif_req_update_ie {
u8 beacon:1;
u8 probe_resp:1;
@@ -106,7 +102,7 @@ struct hif_req_update_ie {
u8 reserved1:5;
u8 reserved2;
__le16 num_ies;
- struct hif_ie_tlv ie[];
+ struct element ie[];
} __packed;

struct hif_cnf_update_ie {
--
2.28.0