Merge branch 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax

[sfrench/cifs-2.6.git] / net / mac80211 / status.c

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index d6a1bfaa7a817f0511fca16262f2c132ff5432f2..0dd7c351002dbe909b973b5b048ec9652be00b1b 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -95,7 +95,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
                 */
                if (*p & IEEE80211_QOS_CTL_EOSP)
                        *p &= ~IEEE80211_QOS_CTL_EOSP;
-               ac = ieee802_1d_to_ac[tid & 7];
+               ac = ieee80211_ac_from_tid(tid);
        } else {
                ac = IEEE80211_AC_BE;
        }
@@ -462,9 +462,7 @@ static void ieee80211_report_ack_skb(struct ieee80211_local *local,
        unsigned long flags;
 
        spin_lock_irqsave(&local->ack_status_lock, flags);
-       skb = idr_find(&local->ack_status_frames, info->ack_frame_id);
-       if (skb)
-               idr_remove(&local->ack_status_frames, info->ack_frame_id);
+       skb = idr_remove(&local->ack_status_frames, info->ack_frame_id);
        spin_unlock_irqrestore(&local->ack_status_lock, flags);
 
        if (!skb)