md/raid0: apply base queue limits *before* disk_stack_limits

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / status.c

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 45628f37c083aa72575fcc0a0241b1aefc0cb5ad..8ba5832435095f10e94f782e07d92a4f742cad3a 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -515,7 +515,7 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
 
                if (!sdata) {
                        skb->dev = NULL;
-               } else if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) {
+               } else {
                        unsigned int hdr_size =
                                ieee80211_hdrlen(hdr->frame_control);
 
@@ -529,9 +529,6 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
                                ieee80211_mgd_conn_tx_status(sdata,
                                                             hdr->frame_control,
                                                             acked);
-               } else {
-                       /* we assign ack frame ID for the others */
-                       WARN_ON(1);
                }
 
                rcu_read_unlock();