John,
Please pull my iwlwifi-next tree. I've included debugging aids, fixes
for recently introduced bugs (the Makefile order & dynamic loading
locking/list corruption), some refactoring and various other changes.
Also, I've fixed the 6035 device configuration which was added in
wireless but in wireless-next now needs an EEPROM configuration pointer.
Thanks!
johannes
------
The following changes since commit a59f975a78f0606a3a364939dfa9b949d5f87521:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2012-06-12 14:11:13 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git for-john
for you to fetch changes up to 67711c17fc8bcab8f9e92c49049b8356f9a557c1:
iwlwifi: WARN only once when we have trouble in reclaim (2012-06-13 09:02:09 +0200)
----------------------------------------------------------------
Brandon Misemer (1):
iwlwifi: Fix Makefile build order for built-in driver
Dan Carpenter (1):
iwlwifi: turn on a lockdep assertion
Emmanuel Grumbach (10):
iwlwifi: s/iwl_read_targ_mem_words/iwl_read_targ_mem_bytes
iwlwifi: iwl_{read,write}_targ_mem_words takes dwords
iwlwifi: print more info when a queue is stuck
iwlwifi: don't configure a txq that is being disabled
iwlwifi: remove lock around txq_enable
iwlwifi: comment that setting driver_data overrides info->control
iwlwifi: print even more info when a queue is stuck
iwlwifi: don't modify the timer if we don't Tx
iwlwifi: warn if TFD index and WiFi Seq don't match
iwlwifi: WARN only once when we have trouble in reclaim
Ilan Peer (2):
iwlwifi: refactor testmode
iwlwifi: decouple testmode and iwl-test
Johannes Berg (4):
iwlwifi: fix dynamic loading
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
iwlwifi: fix 6035 device parameters
iwlwifi: use request_module instead of _nowait
drivers/net/wireless/iwlwifi/Makefile | 10 +-
drivers/net/wireless/iwlwifi/dvm/agn.h | 17 +-
drivers/net/wireless/iwlwifi/dvm/dev.h | 26 +-
drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/main.c | 6 +-
drivers/net/wireless/iwlwifi/dvm/rx.c | 24 +-
drivers/net/wireless/iwlwifi/dvm/testmode.c | 778 ++----------------
drivers/net/wireless/iwlwifi/dvm/tx.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-drv.c | 34 +-
drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +
drivers/net/wireless/iwlwifi/iwl-io.c | 20 +-
drivers/net/wireless/iwlwifi/iwl-io.h | 14 +-
drivers/net/wireless/iwlwifi/iwl-test.c | 856 ++++++++++++++++++++
drivers/net/wireless/iwlwifi/iwl-test.h | 161 ++++
.../iwlwifi/{dvm/testmode.h => iwl-testmode.h} | 0
drivers/net/wireless/iwlwifi/pcie/6000.c | 1 +
drivers/net/wireless/iwlwifi/pcie/internal.h | 9 +-
drivers/net/wireless/iwlwifi/pcie/trans.c | 60 +-
drivers/net/wireless/iwlwifi/pcie/tx.c | 95 +--
20 files changed, 1263 insertions(+), 858 deletions(-)
create mode 100644 drivers/net/wireless/iwlwifi/iwl-test.c
create mode 100644 drivers/net/wireless/iwlwifi/iwl-test.h
rename drivers/net/wireless/iwlwifi/{dvm/testmode.h => iwl-testmode.h} (100%)
Attachment:
signature.asc
Description: This is a digitally signed message part
