diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 16:19:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 16:19:12 +1100 |
| commit | eb27cd91f0b42319cd1cdefbed9ed7d87215890f (patch) | |
| tree | a8cc57a0ea86d57c33e10e02b428b5133ec336b2 /net | |
| parent | 49120e13fc435b69dcea38ce79713e653e83e84b (diff) | |
| parent | 12d3b9b904e8ab18c1d33f083fd43b5a5b19abe9 (diff) | |
Merge remote-tracking branch 'idr/idr-4.11'
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/status.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index a3af6e1bfd98..0dd7c351002d 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -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) |