Hi John,

One single patch for this pull request for 3.14.

As explicitly written in the commit message, we prefer to disable Tx
AMPDU on NICs supported by iwldvm. This feature gives a big boost in Tx
performance, but the firmware is buggy and we can't rely on it.
Our hope is that most of the users out there want wifi to surf on the
web which means that they care more for Rx traffic than for Tx.
People who want to enable it can do so with a simple Kconfig entry.
Rx AMPDU is still enabled by default.

Please pull - thanks.

	emmanuel

The following changes since commit c512865446e6dd5b6e91e81187e75b734ad7cfc7:

  iwlwifi: mvm: don't allow A band if SKU forbids it (2014-02-02
11:08:42 +0200)

are available in the git repository at:


git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git
for-john

for you to fetch changes up to 930e106d90ca902c8ede0a8cb206cee1ef3c5cc0:

  iwlwifi: disable TX AMPDU by default for iwldvm (2014-02-12 10:38:44
+0200)

----------------------------------------------------------------
Emmanuel Grumbach (1):
      iwlwifi: disable TX AMPDU by default for iwldvm

 drivers/net/wireless/iwlwifi/Kconfig         |   10 ++++++++
 drivers/net/wireless/iwlwifi/dvm/mac80211.c  |    8 +++----
 drivers/net/wireless/iwlwifi/dvm/tx.c        |   32
++++++++++++++------------
 drivers/net/wireless/iwlwifi/iwl-drv.c       |    2 +-
 drivers/net/wireless/iwlwifi/iwl-modparams.h |    1 -
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c |    2 --
 drivers/net/wireless/iwlwifi/mvm/mac80211.c  |    8 -------
 7 files changed, 32 insertions(+), 31 deletions(-)