1 files changed, 15 insertions, 33 deletions

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 28cfa981cfb1..8cd72914cdaf 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -155,13 +155,10 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
                 return;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        if (net_ratelimit())
-                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_flag(sta, WLAN_STA_PS_STA), jiffies);
-#endif
+        ps_dbg_ratelimited(sta->sdata,
+                           "dropped TX filtered frame, queue_len=%d PS=%d @%lu\n",
+                           skb_queue_len(&sta->tx_filtered[ac]),
+                           !!test_sta_flag(sta, WLAN_STA_PS_STA), jiffies);
         dev_kfree_skb(skb);
 }
 
@@ -520,36 +517,21 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
 
         if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
                 u64 cookie = (unsigned long)skb;
+                acked = info->flags & IEEE80211_TX_STAT_ACK;
 
-                if (ieee80211_is_nullfunc(hdr->frame_control) ||
-                    ieee80211_is_qos_nullfunc(hdr->frame_control)) {
-                        acked = info->flags & IEEE80211_TX_STAT_ACK;
+                /*
+                 * TODO: When we have non-netdev frame TX,
+                 * we cannot use skb->dev->ieee80211_ptr
+                 */
 
+                if (ieee80211_is_nullfunc(hdr->frame_control) ||
+                    ieee80211_is_qos_nullfunc(hdr->frame_control))
                         cfg80211_probe_status(skb->dev, hdr->addr1,
                                               cookie, acked, GFP_ATOMIC);
-                } else {
-                        struct ieee80211_work *wk;
-
-                        rcu_read_lock();
-                        list_for_each_entry_rcu(wk, &local->work_list, list) {
-                                if (wk->type != IEEE80211_WORK_OFFCHANNEL_TX)
-                                        continue;
-                                if (wk->offchan_tx.frame != skb)
-                                        continue;
-                                wk->offchan_tx.status = true;
-                                break;
-                        }
-                        rcu_read_unlock();
-                        if (local->hw_roc_skb_for_status == skb) {
-                                cookie = local->hw_roc_cookie ^ 2;
-                                local->hw_roc_skb_for_status = NULL;
-                        }
-
+                else
                         cfg80211_mgmt_tx_status(
-                                skb->dev, cookie, skb->data, skb->len,
-                                !!(info->flags & IEEE80211_TX_STAT_ACK),
-                                GFP_ATOMIC);
-                }
+                                skb->dev->ieee80211_ptr, cookie, skb->data,
+                                skb->len, acked, GFP_ATOMIC);
         }
 
         if (unlikely(info->ack_frame_id)) {
@@ -589,7 +571,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
         /* send frame to monitor interfaces now */
         rtap_len = ieee80211_tx_radiotap_len(info);
         if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) {
-                printk(KERN_ERR "ieee80211_tx_status: headroom too small\n");
+                pr_err("ieee80211_tx_status: headroom too small\n");
                 dev_kfree_skb(skb);
                 return;
         }