From: Jérôme Pouiller <jerome.pouiller@silabs.com>
Date: Mon, 7 Sep 2020 10:15:15 +0000 (+0200)
Subject: staging: wfx: drop struct hif_ie_tlv
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a1a97225900c8b20b8821f49ed9127b18f1e4888;p=linux.git

staging: wfx: drop struct hif_ie_tlv

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@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-26-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 c18e762485a9b..ef5483609dcb5 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 {