pull-request: iwlwifi-next 2013-06-11

pull-request: iwlwifi-next 2013-06-11

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]

Hi,

For iwlwifi-next I only have a few cleanups:

Emmanuel 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.

johannes

The following changes since commit fded313ec045024d4f769ce6b3e41fe343c167b0:

  iwlwifi: mvm: don't request SMPS on non-STA iface (2013-06-05 09:06:13 +0200)

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 476a9e09cbe37bad93de6e460b76f89f3ad22c9b:

  iwlwifi: ignore 0-length PHY DB sections (2013-06-11 20:12:02 +0200)

----------------------------------------------------------------
Emmanuel Grumbach (3):
      iwlwifi: mvm: remove unused wait_for_ba field
      iwlwifi: mvm: fix irrelevant comment
      iwlwifi: ignore 0-length PHY DB sections

Johannes Berg (1):
      iwlwifi: mvm: remove iwl_mvm_dbgfs_set_fw_dbg_log declaration

 drivers/net/wireless/iwlwifi/iwl-phy-db.c   | 3 +++
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 3 +--
 drivers/net/wireless/iwlwifi/mvm/mvm.h      | 5 -----
 drivers/net/wireless/iwlwifi/mvm/sta.h      | 2 --
 4 files changed, 4 insertions(+), 9 deletions(-)


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: pull-request: iwlwifi-next 2013-06-11

[Johannes Berg]

On Tue, 2013-06-11 at 20:15 +0200, Johannes Berg wrote:
> Hi,
> 
> For iwlwifi-next I only have a few cleanups:

I was wondering while writing this ... but didn't realize quickly enough
I'd applied a few patches to the wrong tree :(

Sorry about that, new one coming!

johannes

Re: pull-request: iwlwifi-next 2013-06-11

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 2051 bytes --]

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 #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]