Hi John, Still it's mostly cleanups, with a few fixes thrown in. I had to merge wireless-next/master to get the interface combinations revert that I had to do due to my own stupidity :-) Emmanuel contributed two AP mode fixes, removed an unused field, fixed a comment and added a warning for something that shouldn't happen in practice, and I removed the declaration of a function that doesn't even exist and cleaned up a small include. johannes The following changes since commit 8b3e7be437a6b62118d0485ad971e724afe23fdf: cw1200: Fix an assorted pile of checkpatch warnings. (2013-06-11 12:48:10 -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 8eb3871076875f247483f4a1fe6713e6d440c53e: iwlwifi: mvm: Update the supported interface combinations (2013-06-11 20:17:06 +0200) ---------------------------------------------------------------- Emmanuel Grumbach (5): iwlwifi: mvm: remove unused wait_for_ba field iwlwifi: mvm: fix irrelevant comment iwlwifi: ignore 0-length PHY DB sections iwlwifi: mvm: properly tell the fw that a STA is awake iwlwifi: mvm: don't set the MCAST queue in STA's queue list Ilan Peer (1): iwlwifi: mvm: Update the supported interface combinations Johannes Berg (3): iwlwifi: mvm: remove iwl_mvm_dbgfs_set_fw_dbg_log declaration iwlwifi: include export.h instead of module.h Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next drivers/net/wireless/iwlwifi/iwl-drv.h | 3 +-- drivers/net/wireless/iwlwifi/iwl-phy-db.c | 3 +++ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 5 +---- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 9 ++++----- drivers/net/wireless/iwlwifi/mvm/mvm.h | 5 ----- drivers/net/wireless/iwlwifi/mvm/sta.c | 11 +---------- drivers/net/wireless/iwlwifi/mvm/sta.h | 2 -- 7 files changed, 10 insertions(+), 28 deletions(-)
Attachment:
signature.asc
Description: This is a digitally signed message part