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

Commit 8a5b33f5 authored by John W. Linville's avatar John W. Linville
Browse files

Revert "mac80211: replace netif_tx_{start,stop,wake}_all_queues" 



This reverts commit 53623f1a.

This was inadvertantly missed in "mac80211: fix skb buffering issue",
and is required with that patch to restore proper queue operation.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent debde9ea

net/mac80211/iface.c

+2 −2
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int ieee80211_open(struct net_device *dev) 
	if (sdata->vif.type == NL80211_IFTYPE_STATION)

		ieee80211_queue_work(&local->hw, &sdata->u.mgd.work);



	netif_start_queue(dev);

	netif_tx_start_all_queues(dev);



	return 0;

 err_del_interface:
@@ -345,7 +345,7 @@ static int ieee80211_stop(struct net_device *dev) 
	/*

	 * Stop TX on this interface first.

	 */

	netif_stop_queue(dev);

	netif_tx_stop_all_queues(dev);



	/*

	 * Now delete all active aggregation sessions.

net/mac80211/mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, 
	ieee80211_recalc_ps(local, -1);

	mutex_unlock(&local->iflist_mtx);



	netif_start_queue(sdata->dev);

	netif_tx_start_all_queues(sdata->dev);

	netif_carrier_on(sdata->dev);

}
@@ -1074,7 +1074,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
	 * time -- we don't want the scan code to enable queues.

	 */



	netif_stop_queue(sdata->dev);

	netif_tx_stop_all_queues(sdata->dev);

	netif_carrier_off(sdata->dev);



	rcu_read_lock();

net/mac80211/scan.c

+5 −5
Original line number Diff line number Diff line
@@ -353,10 +353,10 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted) 
		if (sdata->vif.type == NL80211_IFTYPE_STATION) {

			if (sdata->u.mgd.associated) {

				ieee80211_scan_ps_disable(sdata);

				netif_wake_queue(sdata->dev);

				netif_tx_wake_all_queues(sdata->dev);

			}

		} else

			netif_wake_queue(sdata->dev);

			netif_tx_wake_all_queues(sdata->dev);



		/* re-enable beaconing */

		if (sdata->vif.type == NL80211_IFTYPE_AP ||
@@ -411,7 +411,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local) 
		 * are handled in the scan state machine

		 */

		if (sdata->vif.type != NL80211_IFTYPE_STATION)

			netif_stop_queue(sdata->dev);

			netif_tx_stop_all_queues(sdata->dev);

	}

	mutex_unlock(&local->iflist_mtx);
@@ -575,7 +575,7 @@ static void ieee80211_scan_state_leave_oper_channel(struct ieee80211_local *loca 
			continue;



		if (sdata->vif.type == NL80211_IFTYPE_STATION) {

			netif_stop_queue(sdata->dev);

			netif_tx_stop_all_queues(sdata->dev);

			if (sdata->u.mgd.associated)

				ieee80211_scan_ps_enable(sdata);

		}
@@ -610,7 +610,7 @@ static void ieee80211_scan_state_enter_oper_channel(struct ieee80211_local *loca 
		if (sdata->vif.type == NL80211_IFTYPE_STATION) {

			if (sdata->u.mgd.associated)

				ieee80211_scan_ps_disable(sdata);

			netif_wake_queue(sdata->dev);

			netif_tx_wake_all_queues(sdata->dev);

		}

	}

	mutex_unlock(&local->iflist_mtx);