mac80211: remove ieee80211_num_regular_queues
This inline is useless and actually makes the code _longer_
rather than shorter.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 457238a..038460b 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1666,8 +1666,7 @@
}
/* receiver and we are QoS enabled, use a QoS type frame */
- if (sta_flags & WLAN_STA_WME &&
- ieee80211_num_regular_queues(&local->hw) >= 4) {
+ if ((sta_flags & WLAN_STA_WME) && local->hw.queues >= 4) {
fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
hdrlen += 2;
}
@@ -1802,7 +1801,7 @@
int i, j;
struct ieee80211_tx_stored_packet *store;
- for (i = 0; i < ieee80211_num_regular_queues(&local->hw); i++) {
+ for (i = 0; i < local->hw.queues; i++) {
if (!test_bit(i, local->queues_pending))
continue;
store = &local->pending_packet[i];
@@ -1827,7 +1826,7 @@
int i, ret;
netif_tx_lock_bh(dev);
- for (i = 0; i < ieee80211_num_regular_queues(&local->hw); i++) {
+ for (i = 0; i < local->hw.queues; i++) {
/* Check that this queue is ok */
if (__netif_subqueue_stopped(local->mdev, i) &&
!test_bit(i, local->queues_pending_run))