From 3379130ce02880fbafc546d7473e67c64a6b6082 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Sun, 3 Mar 2013 14:35:03 +0200 Subject: [PATCH] --- yaml --- r: 361079 b: refs/heads/master c: 2470b36e84a2e680d7a7e3809cbceae5bfae3606 h: refs/heads/master i: 361077: a7da3568d032d6a3e06a12eee680c9aac13ace25 361075: 079f6942230d58e4ea0db76f7f4becfac1023b91 361071: b988564f01705c8e4aefef18e1f6b533f00444af v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/mvm/tx.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 753a2a28a420..00385364d935 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8101a7f0656bf11c385d6e14f52313b19f017e70 +refs/heads/master: 2470b36e84a2e680d7a7e3809cbceae5bfae3606 diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/tx.c b/trunk/drivers/net/wireless/iwlwifi/mvm/tx.c index 6b67ce3f679c..6645efe5c03e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/mvm/tx.c @@ -607,12 +607,8 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, /* Single frame failure in an AMPDU queue => send BAR */ if (txq_id >= IWL_FIRST_AMPDU_QUEUE && - !(info->flags & IEEE80211_TX_STAT_ACK)) { - /* there must be only one skb in the skb_list */ - WARN_ON_ONCE(skb_freed > 1 || - !skb_queue_empty(&skbs)); + !(info->flags & IEEE80211_TX_STAT_ACK)) info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; - } /* W/A FW bug: seq_ctl is wrong when the queue is flushed */ if (status == TX_STATUS_FAIL_FIFO_FLUSHED) {