2 files changed, 4 insertions, 16 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index d0dd11153a6c..1a8591b77a13 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -647,8 +647,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         spin_lock_init(&local->ack_status_lock);
         idr_init(&local->ack_status_frames);
-        /* preallocate at least one entry */
-        idr_pre_get(&local->ack_status_frames, GFP_KERNEL);
 
         sta_info_init(local);
 
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 5b9602b62405..de8548bf0a7f 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2017,24 +2017,14 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
                 skb = skb_clone(skb, GFP_ATOMIC);
                 if (skb) {
                         unsigned long flags;
-                        int id, r;
+                        int id;
 
                         spin_lock_irqsave(&local->ack_status_lock, flags);
-                        r = idr_get_new_above(&local->ack_status_frames,
-                                              orig_skb, 1, &id);
-                        if (r == -EAGAIN) {
-                                idr_pre_get(&local->ack_status_frames,
-                                            GFP_ATOMIC);
-                                r = idr_get_new_above(&local->ack_status_frames,
-                                                      orig_skb, 1, &id);
-                        }
-                        if (WARN_ON(!id) || id > 0xffff) {
-                                idr_remove(&local->ack_status_frames, id);
-                                r = -ERANGE;
-                        }
+                        id = idr_alloc(&local->ack_status_frames, orig_skb,
+                                       1, 0x10000, GFP_ATOMIC);
                         spin_unlock_irqrestore(&local->ack_status_lock, flags);
 
-                        if (!r) {
+                        if (id >= 0) {
                                 info_id = id;
                                 info_flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;
                         } else if (skb_shared(skb)) {