Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09db3b00 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

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: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 759c5b59

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+19 −0
Original line number Diff line number Diff line
@@ -1843,6 +1843,25 @@ int rt2800_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}

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)

{

drivers/net/wireless/ralink/rt2x00/rt2800lib.h

+1 −0
Original line number Diff line number Diff line
@@ -257,5 +257,6 @@ void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev); 
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 */

drivers/net/wireless/ralink/rt2x00/rt2800pci.c

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { 
	.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 = {

drivers/net/wireless/ralink/rt2x00/rt2800soc.c

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ static const struct rt2x00lib_ops rt2800soc_rt2x00_ops = { 
	.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 = {

drivers/net/wireless/ralink/rt2x00/rt2800usb.c

+1 −0
Original line number Diff line number Diff line
@@ -706,6 +706,7 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = { 
	.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)