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

Commit 2337db8d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: use subqueue helpers 



There are subqueue helpers so that we don't
need to get the TX queue and then wake/stop
it, use those helpers.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a621fa4d

net/mac80211/tx.c

+1 −2
Original line number Diff line number Diff line
@@ -2092,8 +2092,7 @@ void ieee80211_tx_pending(unsigned long data) 


		if (skb_queue_empty(&local->pending[i]))

			list_for_each_entry_rcu(sdata, &local->interfaces, list)

				netif_tx_wake_queue(

					netdev_get_tx_queue(sdata->dev, i));

				netif_wake_subqueue(sdata->dev, i);

	}

	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);

net/mac80211/util.c

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, 
	if (skb_queue_empty(&local->pending[queue])) {

		rcu_read_lock();

		list_for_each_entry_rcu(sdata, &local->interfaces, list)

			netif_tx_wake_queue(netdev_get_tx_queue(sdata->dev, queue));

			netif_wake_subqueue(sdata->dev, queue);

		rcu_read_unlock();

	} else

		tasklet_schedule(&local->tx_pending_tasklet);
@@ -323,7 +323,7 @@ static void __ieee80211_stop_queue(struct ieee80211_hw *hw, int queue, 


	rcu_read_lock();

	list_for_each_entry_rcu(sdata, &local->interfaces, list)

		netif_tx_stop_queue(netdev_get_tx_queue(sdata->dev, queue));

		netif_stop_subqueue(sdata->dev, queue);

	rcu_read_unlock();

}