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

Commit 445ea4e8 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: stop queues temporarily for flushing 



Sometimes queues are flushed in the middle of
operation, which can lead to driver issues.
Stop queues temporarily, while flushing, to
avoid transmitting new packets while they are
being flushed.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 39ecc01d

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -93,9 +93,11 @@ struct device; 
 * enum ieee80211_max_queues - maximum number of queues

 *

 * @IEEE80211_MAX_QUEUES: Maximum number of regular device queues.

 * @IEEE80211_MAX_QUEUE_MAP: bitmap with maximum queues set

 */

enum ieee80211_max_queues {

	IEEE80211_MAX_QUEUES =		16,

	IEEE80211_MAX_QUEUE_MAP =	BIT(IEEE80211_MAX_QUEUES) - 1,

};



#define IEEE80211_INVAL_HW_QUEUE	0xff

net/mac80211/ieee80211_i.h

+3 −0
Original line number Diff line number Diff line
@@ -809,6 +809,7 @@ enum queue_stop_reason { 
	IEEE80211_QUEUE_STOP_REASON_SUSPEND,

	IEEE80211_QUEUE_STOP_REASON_SKB_ADD,

	IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL,

	IEEE80211_QUEUE_STOP_REASON_FLUSH,

};



#ifdef CONFIG_MAC80211_LEDS
@@ -1522,8 +1523,10 @@ void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata, 
			     struct ieee80211_hdr *hdr, bool ack);



void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,

				     unsigned long queues,

				     enum queue_stop_reason reason);

void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,

				     unsigned long queues,

				     enum queue_stop_reason reason);

void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,

				    enum queue_stop_reason reason);

net/mac80211/main.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw) 
		   "Hardware restart was requested\n");



	/* use this reason, ieee80211_reconfig will unblock it */

	ieee80211_stop_queues_by_reason(hw,

	ieee80211_stop_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_SUSPEND);



	/*

net/mac80211/mlme.c

+4 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,7 @@ static void ieee80211_chswitch_work(struct work_struct *work) 


	/* XXX: wait for a beacon first? */

	ieee80211_wake_queues_by_reason(&sdata->local->hw,

					IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_CSA);

 out:

	ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;
@@ -1108,6 +1109,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 


	if (sw_elem->mode)

		ieee80211_stop_queues_by_reason(&sdata->local->hw,

				IEEE80211_MAX_QUEUE_MAP,

				IEEE80211_QUEUE_STOP_REASON_CSA);



	if (sdata->local->ops->channel_switch) {
@@ -1375,6 +1377,7 @@ void ieee80211_dynamic_ps_disable_work(struct work_struct *work) 
	}



	ieee80211_wake_queues_by_reason(&local->hw,

					IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_PS);

}
@@ -2071,6 +2074,7 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata) 
			       true, frame_buf);

	ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;

	ieee80211_wake_queues_by_reason(&sdata->local->hw,

					IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_CSA);

	mutex_unlock(&ifmgd->mtx);

net/mac80211/offchannel.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local) 
	 * Stop queues and transmit all frames queued by the driver

	 * before sending nullfunc to enable powersave at the AP.

	 */

	ieee80211_stop_queues_by_reason(&local->hw,

	ieee80211_stop_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL);

	ieee80211_flush_queues(local, NULL);
@@ -181,7 +181,7 @@ void ieee80211_offchannel_return(struct ieee80211_local *local) 
	}

	mutex_unlock(&local->iflist_mtx);



	ieee80211_wake_queues_by_reason(&local->hw,

	ieee80211_wake_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL);

}