Hi John, This is hopefully going to be the last big pull request for iwlwifi-next, luckily it actually mostly removes code ;-) Emmanuel removed some unneeded/unsupported module parameters and adds a Bluetooth 1x1 lookup-table for some upcoming products. From Alex I have an older patch to add low-power receive support, this depended on a mac80211 commit that only just came in with the merge from wireless-next I did. Ilan made beacon timings better, and Eytan added some debug statements for thermal throttling. I have a few cleanups, a fix for a long-standing but rare warning, and, arguably the most important patch here, the firmware API version bump for the 7260/3160 devices. Let me know if there are any issues. johannes The following changes since commit 9fbdc75116f7a2b183464d42f3abccb616584105: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next (2013-06-24 14:45:50 -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 bd4ace2a36e7c87bb5f3eceb54d3b304d395dcf0: iwlwifi: mvm: Add support for Low Power RX (2013-06-25 12:21:19 +0200) ---------------------------------------------------------------- Alexander Bondar (1): iwlwifi: mvm: Add support for Low Power RX Emmanuel Grumbach (4): iwlwifi: remove bt_ch_announce module param iwlwifi: remove plcp_check module parameter iwlwifi: remove auto_agg module parameter iwlwifi: mvm: add BT-Coex LUT for 1x1 products Ilan Peer (1): iwlwifi: mvm: Change the settings of AP beacon time Johannes Berg (7): iwlwifi: bump required firmware API version for 3160/7260 iwlwifi: mvm: allow firmware crashes to wake system for debug iwlwifi: remove testmode iwlwifi: pcie: rework RX buffer list init and freeing iwlwifi: always use 'rxq' as RX queue struct name iwlwifi: always use 'trans_pcie' name Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next eytan lifshitz (1): iwlwifi: mvm: add thermal throttling debugging drivers/net/wireless/iwlwifi/Kconfig | 10 - drivers/net/wireless/iwlwifi/Makefile | 1 - drivers/net/wireless/iwlwifi/dvm/Makefile | 1 - drivers/net/wireless/iwlwifi/dvm/agn.h | 37 - drivers/net/wireless/iwlwifi/dvm/dev.h | 13 +- drivers/net/wireless/iwlwifi/dvm/lib.c | 6 - drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 - drivers/net/wireless/iwlwifi/dvm/main.c | 15 +- drivers/net/wireless/iwlwifi/dvm/rs.c | 43 +- drivers/net/wireless/iwlwifi/dvm/rx.c | 40 +- drivers/net/wireless/iwlwifi/dvm/testmode.c | 471 ------------- drivers/net/wireless/iwlwifi/dvm/tx.c | 12 - drivers/net/wireless/iwlwifi/iwl-7000.c | 12 +- drivers/net/wireless/iwlwifi/iwl-config.h | 1 + drivers/net/wireless/iwlwifi/iwl-drv.c | 16 - drivers/net/wireless/iwlwifi/iwl-modparams.h | 6 - drivers/net/wireless/iwlwifi/iwl-test.c | 852 ------------------------ drivers/net/wireless/iwlwifi/iwl-test.h | 161 ----- drivers/net/wireless/iwlwifi/iwl-testmode.h | 309 --------- drivers/net/wireless/iwlwifi/iwl-trans.h | 2 - drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 21 +- drivers/net/wireless/iwlwifi/mvm/d3.c | 6 + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 27 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 5 + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 56 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 8 +- drivers/net/wireless/iwlwifi/mvm/power.c | 22 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 30 +- drivers/net/wireless/iwlwifi/mvm/tt.c | 22 +- drivers/net/wireless/iwlwifi/pcie/rx.c | 71 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 17 +- 31 files changed, 251 insertions(+), 2044 deletions(-) delete mode 100644 drivers/net/wireless/iwlwifi/dvm/testmode.c delete mode 100644 drivers/net/wireless/iwlwifi/iwl-test.c delete mode 100644 drivers/net/wireless/iwlwifi/iwl-test.h delete mode 100644 drivers/net/wireless/iwlwifi/iwl-testmode.h
Attachment:
signature.asc
Description: This is a digitally signed message part