diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-08 15:53:47 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-08 15:53:47 -0500 |
| commit | cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d (patch) | |
| tree | 0a9bccc45ca1a02597ab35caca8c2fe92889f0b2 /drivers/net/wireless/iwlwifi/mvm/tx.c | |
| parent | 3d5c203272b25c4391397247cdb0059a04fccddf (diff) | |
| parent | 25b9ea5c797b5d78f8ceced9ad9c7a7daf0db19c (diff) | |
| download | op-kernel-dev-cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d.zip op-kernel-dev-cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/tx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c index 56df249..0556d5e 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c @@ -22,7 +22,7 @@ * USA * * The full GNU General Public License is included in this distribution - * in the file called LICENSE.GPL. + * in the file called COPYING. * * Contact Information: * Intel Linux Wireless <ilw@linux.intel.com> @@ -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) { |
