Commit 9b1cd826 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo

wifi: mwifiex: cleanup private data structures

Drop unused fields 'status_code' of 'struct mwifiex_txinfo',
'dfs_chan_switch_timer', 'sleep_params' (including related data
type 'struct mwifiex_sleep_params') of 'struct mwifiex_adapter',
adjust related code.
Acked-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230802160726.85545-2-dmantipov@yandex.ru
parent 9c8fd72a
...@@ -180,7 +180,6 @@ struct mwifiex_rxinfo { ...@@ -180,7 +180,6 @@ struct mwifiex_rxinfo {
}; };
struct mwifiex_txinfo { struct mwifiex_txinfo {
u32 status_code;
u8 flags; u8 flags;
u8 bss_num; u8 bss_num;
u8 bss_type; u8 bss_type;
......
...@@ -282,7 +282,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) ...@@ -282,7 +282,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM); sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM);
sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED); sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED);
memset(&adapter->sleep_params, 0, sizeof(adapter->sleep_params));
memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period)); memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period));
adapter->tx_lock_flag = false; adapter->tx_lock_flag = false;
adapter->null_pkt_interval = 0; adapter->null_pkt_interval = 0;
......
...@@ -444,15 +444,6 @@ struct mwifiex_current_bss_params { ...@@ -444,15 +444,6 @@ struct mwifiex_current_bss_params {
u8 data_rates[MWIFIEX_SUPPORTED_RATES]; u8 data_rates[MWIFIEX_SUPPORTED_RATES];
}; };
struct mwifiex_sleep_params {
u16 sp_error;
u16 sp_offset;
u16 sp_stable_time;
u8 sp_cal_control;
u8 sp_ext_sleep_clk;
u16 sp_reserved;
};
struct mwifiex_sleep_period { struct mwifiex_sleep_period {
u16 period; u16 period;
u16 reserved; u16 reserved;
...@@ -681,7 +672,6 @@ struct mwifiex_private { ...@@ -681,7 +672,6 @@ struct mwifiex_private {
struct cfg80211_chan_def dfs_chandef; struct cfg80211_chan_def dfs_chandef;
struct workqueue_struct *dfs_cac_workqueue; struct workqueue_struct *dfs_cac_workqueue;
struct delayed_work dfs_cac_work; struct delayed_work dfs_cac_work;
struct timer_list dfs_chan_switch_timer;
struct workqueue_struct *dfs_chan_sw_workqueue; struct workqueue_struct *dfs_chan_sw_workqueue;
struct delayed_work dfs_chan_sw_work; struct delayed_work dfs_chan_sw_work;
struct cfg80211_beacon_data beacon_after; struct cfg80211_beacon_data beacon_after;
...@@ -955,7 +945,6 @@ struct mwifiex_adapter { ...@@ -955,7 +945,6 @@ struct mwifiex_adapter {
u8 config_bands; u8 config_bands;
struct mwifiex_chan_scan_param_set *scan_channels; struct mwifiex_chan_scan_param_set *scan_channels;
u8 tx_lock_flag; u8 tx_lock_flag;
struct mwifiex_sleep_params sleep_params;
struct mwifiex_sleep_period sleep_period; struct mwifiex_sleep_period sleep_period;
u16 ps_mode; u16 ps_mode;
u32 ps_state; u32 ps_state;
......
...@@ -42,7 +42,6 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv, ...@@ -42,7 +42,6 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
if (!skb->len) { if (!skb->len) {
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"Tx: bad packet length: %d\n", skb->len); "Tx: bad packet length: %d\n", skb->len);
tx_info->status_code = -1;
return skb->data; return skb->data;
} }
......
...@@ -474,7 +474,6 @@ void *mwifiex_process_uap_txpd(struct mwifiex_private *priv, ...@@ -474,7 +474,6 @@ void *mwifiex_process_uap_txpd(struct mwifiex_private *priv,
if (!skb->len) { if (!skb->len) {
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"Tx: bad packet length: %d\n", skb->len); "Tx: bad packet length: %d\n", skb->len);
tx_info->status_code = -1;
return skb->data; return skb->data;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment