John,
Please also pull my iwlwifi.git tree, I have two fixes: one to remove a
spurious warning that can actually trigger in legitimate situations, and
the other to fix a regression from when monitor mode was changed to use
the "sniffer" firmware mode.
Note that the patch to remove the warning is already in wireless-next
because I didn't realize it was needed right now. It will cause a minor
merge conflict, you can just use the wireless-next version of the code
though since it's in there.
Thanks,
johannes
The following changes since commit 31df3bb78be614fb9125abe56972dfee79bd3e18:
iwlwifi: use ieee80211_free_txskb (2012-11-07 09:18:43 +0100)
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 e1b69fdf33f63cfa600b992172d7376f9d9ef2e9:
iwlwifi: don't WARN when a non empty queue is disabled (2012-11-18 11:51:09 +0100)
----------------------------------------------------------------
Emmanuel Grumbach (1):
iwlwifi: don't WARN when a non empty queue is disabled
Johannes Berg (1):
iwlwifi: fix monitor mode FCS flag
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 14 ++++++++++++++
drivers/net/wireless/iwlwifi/pcie/tx.c | 8 --------
2 files changed, 14 insertions(+), 8 deletions(-)
Attachment:
signature.asc
Description: This is a digitally signed message part
