You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
97 lines
3.5 KiB
Diff
97 lines
3.5 KiB
Diff
From 09db3b000619b38d504e1fff66efed33dfacb6c0 Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Sat, 15 Jun 2019 12:00:57 +0200
|
|
Subject: [PATCH 04/15] rt2800: add pre_reset_hw callback
|
|
|
|
Add routine to cleanup interfaces data before hw reset as
|
|
ieee80211_restart_hw() will do setup interfaces again.
|
|
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
.../net/wireless/ralink/rt2x00/rt2800lib.c | 19 +++++++++++++++++++
|
|
.../net/wireless/ralink/rt2x00/rt2800lib.h | 1 +
|
|
.../net/wireless/ralink/rt2x00/rt2800pci.c | 1 +
|
|
.../net/wireless/ralink/rt2x00/rt2800soc.c | 1 +
|
|
.../net/wireless/ralink/rt2x00/rt2800usb.c | 1 +
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00.h | 1 +
|
|
6 files changed, 24 insertions(+)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -1854,6 +1854,25 @@ int rt2800_sta_remove(struct ieee80211_h
|
|
}
|
|
EXPORT_SYMBOL_GPL(rt2800_sta_remove);
|
|
|
|
+void rt2800_pre_reset_hw(struct rt2x00_dev *rt2x00dev)
|
|
+{
|
|
+ struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
|
|
+ struct data_queue *queue = rt2x00dev->bcn;
|
|
+ struct queue_entry *entry;
|
|
+ int i, wcid;
|
|
+
|
|
+ for (wcid = WCID_START; wcid < WCID_END; wcid++) {
|
|
+ drv_data->wcid_to_sta[wcid - WCID_START] = NULL;
|
|
+ __clear_bit(wcid - WCID_START, drv_data->sta_ids);
|
|
+ }
|
|
+
|
|
+ for (i = 0; i < queue->limit; i++) {
|
|
+ entry = &queue->entries[i];
|
|
+ clear_bit(ENTRY_BCN_ASSIGNED, &entry->flags);
|
|
+ }
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(rt2800_pre_reset_hw);
|
|
+
|
|
void rt2800_config_filter(struct rt2x00_dev *rt2x00dev,
|
|
const unsigned int filter_flags)
|
|
{
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
|
@@ -268,5 +268,6 @@ void rt2800_disable_wpdma(struct rt2x00_
|
|
void rt2800_get_txwi_rxwi_size(struct rt2x00_dev *rt2x00dev,
|
|
unsigned short *txwi_size,
|
|
unsigned short *rxwi_size);
|
|
+void rt2800_pre_reset_hw(struct rt2x00_dev *rt2x00dev);
|
|
|
|
#endif /* RT2800LIB_H */
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
|
|
@@ -379,6 +379,7 @@ static const struct rt2x00lib_ops rt2800
|
|
.config_erp = rt2800_config_erp,
|
|
.config_ant = rt2800_config_ant,
|
|
.config = rt2800_config,
|
|
+ .pre_reset_hw = rt2800_pre_reset_hw,
|
|
};
|
|
|
|
static const struct rt2x00_ops rt2800pci_ops = {
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800soc.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800soc.c
|
|
@@ -225,6 +225,7 @@ static const struct rt2x00lib_ops rt2800
|
|
.config_erp = rt2800_config_erp,
|
|
.config_ant = rt2800_config_ant,
|
|
.config = rt2800_config,
|
|
+ .pre_reset_hw = rt2800_pre_reset_hw,
|
|
};
|
|
|
|
static const struct rt2x00_ops rt2800soc_ops = {
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
|
|
@@ -717,6 +717,7 @@ static const struct rt2x00lib_ops rt2800
|
|
.config_erp = rt2800_config_erp,
|
|
.config_ant = rt2800_config_ant,
|
|
.config = rt2800_config,
|
|
+ .pre_reset_hw = rt2800_pre_reset_hw,
|
|
};
|
|
|
|
static void rt2800usb_queue_init(struct data_queue *queue)
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
@@ -627,6 +627,7 @@ struct rt2x00lib_ops {
|
|
void (*config) (struct rt2x00_dev *rt2x00dev,
|
|
struct rt2x00lib_conf *libconf,
|
|
const unsigned int changed_flags);
|
|
+ void (*pre_reset_hw) (struct rt2x00_dev *rt2x00dev);
|
|
int (*sta_add) (struct rt2x00_dev *rt2x00dev,
|
|
struct ieee80211_vif *vif,
|
|
struct ieee80211_sta *sta);
|