Commit 57f9807d authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

rt2x00: implement reconfig_complete 



mac80211 has .reconfig_complete that can be used as indicator of
HW restart end. This will allow to configure keys/IV differently
for HW restart and normal configuration.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f4279393

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

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ static const struct ieee80211_ops rt2800pci_mac80211_ops = { 
	.get_survey		= rt2800_get_survey,

	.get_ringparam		= rt2x00mac_get_ringparam,

	.tx_frames_pending	= rt2x00mac_tx_frames_pending,

	.reconfig_complete	= rt2x00mac_reconfig_complete,

};



static const struct rt2800_ops rt2800pci_rt2800_ops = {

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

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ static const struct ieee80211_ops rt2800soc_mac80211_ops = { 
	.get_survey		= rt2800_get_survey,

	.get_ringparam		= rt2x00mac_get_ringparam,

	.tx_frames_pending	= rt2x00mac_tx_frames_pending,

	.reconfig_complete	= rt2x00mac_reconfig_complete,

};



static const struct rt2800_ops rt2800soc_rt2800_ops = {

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

+1 −0
Original line number Diff line number Diff line
@@ -654,6 +654,7 @@ static const struct ieee80211_ops rt2800usb_mac80211_ops = { 
	.get_survey		= rt2800_get_survey,

	.get_ringparam		= rt2x00mac_get_ringparam,

	.tx_frames_pending	= rt2x00mac_tx_frames_pending,

	.reconfig_complete	= rt2x00mac_reconfig_complete,

};



static const struct rt2800_ops rt2800usb_rt2800_ops = {

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

+2 −0
Original line number Diff line number Diff line
@@ -1439,6 +1439,8 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, 
		  struct sk_buff *skb);

int rt2x00mac_start(struct ieee80211_hw *hw);

void rt2x00mac_stop(struct ieee80211_hw *hw);

void rt2x00mac_reconfig_complete(struct ieee80211_hw *hw,

				 enum ieee80211_reconfig_type reconfig_type);

int rt2x00mac_add_interface(struct ieee80211_hw *hw,

			    struct ieee80211_vif *vif);

void rt2x00mac_remove_interface(struct ieee80211_hw *hw,

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

+0 −11
Original line number Diff line number Diff line
@@ -1255,16 +1255,6 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev) 
{

	int retval = 0;



	if (test_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags)) {

		/*

		 * This is special case for ieee80211_restart_hw(), otherwise

		 * mac80211 never call start() two times in row without stop();

		 */

		set_bit(DEVICE_STATE_RESET, &rt2x00dev->flags);

		rt2x00dev->ops->lib->pre_reset_hw(rt2x00dev);

		rt2x00lib_stop(rt2x00dev);

	}



	/*

	 * If this is the first interface which is added,

	 * we should load the firmware now.
@@ -1292,7 +1282,6 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev) 
	set_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags);



out:

	clear_bit(DEVICE_STATE_RESET, &rt2x00dev->flags);

	return retval;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE