2021-07-21 18:29:09

by Fabio Aiuto

[permalink] [raw]
Subject: [PATCH 09/16] staging: rtl8723bs: remove struct ndis_802_11_conf_fh

all members of struct ndis_802_11_conf_fh fh_config in
struct ndis_802_11_conf are set to zero and their values
are never used. So remove struct ndis_802_11_conf_fh.

Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ----
drivers/staging/rtl8723bs/include/wlan_bssdef.h | 8 --------
2 files changed, 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index f189cd6c11ac..624bafd44ceb 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2154,10 +2154,6 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter)

pdev_network->configuration.length = sizeof(struct ndis_802_11_conf);
pdev_network->configuration.beacon_period = 100;
- pdev_network->configuration.fh_config.Length = 0;
- pdev_network->configuration.fh_config.HopPattern = 0;
- pdev_network->configuration.fh_config.HopSet = 0;
- pdev_network->configuration.fh_config.DwellTime = 0;
}

void rtw_update_registrypriv_dev_network(struct adapter *adapter)
diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
index 6bdda580cef5..e5ab3cacfa91 100644
--- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
@@ -32,13 +32,6 @@ enum ndis_802_11_network_type {
Ndis802_11NetworkTypeMax /* not a real type, defined as an upper bound */
};

-struct ndis_802_11_conf_fh {
- u32 Length; /* Length of structure */
- u32 HopPattern; /* As defined by 802.11, MSB set */
- u32 HopSet; /* to one if non-802.11 */
- u32 DwellTime; /* units are Kusec */
-};
-
/*
FW will only save the channel number in DSConfig.
ODI Handler will convert the channel number to freq. number.
@@ -48,7 +41,6 @@ struct ndis_802_11_conf {
u32 beacon_period; /* units are Kusec */
u32 atim_window; /* units are Kusec */
u32 ds_config; /* Frequency, units are kHz */
- struct ndis_802_11_conf_fh fh_config;
};

enum ndis_802_11_network_infrastructure {
--
2.20.1