mac80211: optimise station flags

[mirror_ubuntu-artful-kernel.git] / net / mac80211 / status.c

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index b5df9be4d043233f69f6d1b8060f32ff225b78d0..864a9c3bcf4688b08cb25993b9f5f808080cc040 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -96,7 +96,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
         * packet. If the STA went to power save mode, this will happen
         * when it wakes up for the next time.
         */
-       set_sta_flags(sta, WLAN_STA_CLEAR_PS_FILT);
+       set_sta_flag(sta, WLAN_STA_CLEAR_PS_FILT);
 
        /*
         * This code races in the following way:
@@ -132,7 +132,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
         *      changes before calling TX status events if ordering can be
         *      unknown.
         */
-       if (test_sta_flags(sta, WLAN_STA_PS_STA) &&
+       if (test_sta_flag(sta, WLAN_STA_PS_STA) &&
            skb_queue_len(&sta->tx_filtered[ac]) < STA_MAX_TX_BUFFER) {
                skb_queue_tail(&sta->tx_filtered[ac], skb);
                sta_info_recalc_tim(sta);
@@ -144,7 +144,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
                return;
        }
 
-       if (!test_sta_flags(sta, WLAN_STA_PS_STA) &&
+       if (!test_sta_flag(sta, WLAN_STA_PS_STA) &&
            !(info->flags & IEEE80211_TX_INTFL_RETRIED)) {
                /* Software retry the packet once */
                info->flags |= IEEE80211_TX_INTFL_RETRIED;
@@ -157,7 +157,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
                wiphy_debug(local->hw.wiphy,
                            "dropped TX filtered frame, queue_len=%d PS=%d @%lu\n",
                            skb_queue_len(&sta->tx_filtered[ac]),
-                           !!test_sta_flags(sta, WLAN_STA_PS_STA), jiffies);
+                           !!test_sta_flag(sta, WLAN_STA_PS_STA), jiffies);
 #endif
        dev_kfree_skb(skb);
 }
@@ -285,10 +285,10 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
                        continue;
 
                if (info->flags & IEEE80211_TX_STATUS_EOSP)
-                       clear_sta_flags(sta, WLAN_STA_SP);
+                       clear_sta_flag(sta, WLAN_STA_SP);
 
                acked = !!(info->flags & IEEE80211_TX_STAT_ACK);
-               if (!acked && test_sta_flags(sta, WLAN_STA_PS_STA)) {
+               if (!acked && test_sta_flag(sta, WLAN_STA_PS_STA)) {
                        /*
                         * The STA is in power save mode, so assume
                         * that this TX packet failed because of that.