diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-03-12 18:49:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-03-27 20:12:42 -0400 |
commit | 176be728ee7d32cfd33702d82c0733e51f66ab5b (patch) | |
tree | d7b8feb17aab8da7300562ac1dff74002d5ef503 /net/mac80211/tx.c | |
parent | 14587ce2a8898de959f32dfd505b4871f09930d5 (diff) |
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>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 457238a2f3fc..038460b0a48a 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1666,8 +1666,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
1666 | } | 1666 | } |
1667 | 1667 | ||
1668 | /* receiver and we are QoS enabled, use a QoS type frame */ | 1668 | /* receiver and we are QoS enabled, use a QoS type frame */ |
1669 | if (sta_flags & WLAN_STA_WME && | 1669 | if ((sta_flags & WLAN_STA_WME) && local->hw.queues >= 4) { |
1670 | ieee80211_num_regular_queues(&local->hw) >= 4) { | ||
1671 | fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA); | 1670 | fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA); |
1672 | hdrlen += 2; | 1671 | hdrlen += 2; |
1673 | } | 1672 | } |
@@ -1802,7 +1801,7 @@ void ieee80211_clear_tx_pending(struct ieee80211_local *local) | |||
1802 | int i, j; | 1801 | int i, j; |
1803 | struct ieee80211_tx_stored_packet *store; | 1802 | struct ieee80211_tx_stored_packet *store; |
1804 | 1803 | ||
1805 | for (i = 0; i < ieee80211_num_regular_queues(&local->hw); i++) { | 1804 | for (i = 0; i < local->hw.queues; i++) { |
1806 | if (!test_bit(i, local->queues_pending)) | 1805 | if (!test_bit(i, local->queues_pending)) |
1807 | continue; | 1806 | continue; |
1808 | store = &local->pending_packet[i]; | 1807 | store = &local->pending_packet[i]; |
@@ -1827,7 +1826,7 @@ void ieee80211_tx_pending(unsigned long data) | |||
1827 | int i, ret; | 1826 | int i, ret; |
1828 | 1827 | ||
1829 | netif_tx_lock_bh(dev); | 1828 | netif_tx_lock_bh(dev); |
1830 | for (i = 0; i < ieee80211_num_regular_queues(&local->hw); i++) { | 1829 | for (i = 0; i < local->hw.queues; i++) { |
1831 | /* Check that this queue is ok */ | 1830 | /* Check that this queue is ok */ |
1832 | if (__netif_subqueue_stopped(local->mdev, i) && | 1831 | if (__netif_subqueue_stopped(local->mdev, i) && |
1833 | !test_bit(i, local->queues_pending_run)) | 1832 | !test_bit(i, local->queues_pending_run)) |