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/include/net/mac80211.h b/include/net/mac80211.h
index 12a52efcd0d1d8a864224347f3ccf3601c942c25..3bfc6c6c8c4a1b88cab8ce0d0c40f14581de9d8d 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1017,11 +1017,6 @@ static inline void SET_IEEE80211_PERM_ADDR(struct ieee80211_hw *hw, u8 *addr)
        memcpy(hw->wiphy->perm_addr, addr, ETH_ALEN);
 }
 
-static inline int ieee80211_num_regular_queues(struct ieee80211_hw *hw)
-{
-       return hw->queues;
-}
-
 static inline struct ieee80211_rate *
 ieee80211_get_tx_rate(const struct ieee80211_hw *hw,
                      const struct ieee80211_tx_info *c)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 841b8450b3de787823a79b7ffe6ce6e437247d75..aaf7793583a785ce2cb0f88825d45dfb83a2ce49 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1834,7 +1834,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
        ifmgd->flags |= IEEE80211_STA_CREATE_IBSS |
                IEEE80211_STA_AUTO_BSSID_SEL |
                IEEE80211_STA_AUTO_CHANNEL_SEL;
-       if (ieee80211_num_regular_queues(&sdata->local->hw) >= 4)
+       if (sdata->local->hw.queues >= 4)
                ifmgd->flags |= IEEE80211_STA_WMM_ENABLED;
 }
 

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 457238a2f3fc392a087944c7edb5808b2b004c37..038460b0a48a52602e9d0ffad434125c9c1277ac 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1666,8 +1666,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
        }
 
        /* 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 @@ void ieee80211_clear_tx_pending(struct ieee80211_local *local)
        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 @@ void ieee80211_tx_pending(unsigned long data)
        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))