Drop unused 'struct mwifiex_ssid_bssid' and replace custom
'struct mwifiex_802_11_ssid' with generic 'struct cfg80211_ssid'
as a member of 'struct mwifiex_uap_bss_param'. Compile tested only.
Signed-off-by: Dmitry Antipov <dmantipov@xxxxxxxxx>
---
drivers/net/wireless/marvell/mwifiex/decl.h | 5 -----
drivers/net/wireless/marvell/mwifiex/ioctl.h | 7 +------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/decl.h b/drivers/net/wireless/marvell/mwifiex/decl.h
index 326ffb05d791..ac23fa0ae0e7 100644
--- a/drivers/net/wireless/marvell/mwifiex/decl.h
+++ b/drivers/net/wireless/marvell/mwifiex/decl.h
@@ -161,11 +161,6 @@ struct mwifiex_fw_image {
u32 fw_len;
};
-struct mwifiex_802_11_ssid {
- u32 ssid_len;
- u8 ssid[IEEE80211_MAX_SSID_LEN];
-};
-
struct mwifiex_wait_queue {
wait_queue_head_t wait;
int status;
diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h
index e8825f302de8..3ce41dafd515 100644
--- a/drivers/net/wireless/marvell/mwifiex/ioctl.h
+++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h
@@ -37,11 +37,6 @@ struct mwifiex_chan_freq {
u32 freq;
};
-struct mwifiex_ssid_bssid {
- struct cfg80211_ssid ssid;
- u8 bssid[ETH_ALEN];
-};
-
enum {
BAND_B = 1,
BAND_G = 2,
@@ -88,7 +83,7 @@ struct mwifiex_uap_bss_param {
u16 rts_threshold;
u16 frag_threshold;
u8 retry_limit;
- struct mwifiex_802_11_ssid ssid;
+ struct cfg80211_ssid ssid;
u8 bcast_ssid_ctl;
u8 radio_ctl;
u8 dtim_period;
--
2.43.0
