Re: pull request: wireless 2011-12-05

From: John W. Linville
Date: Mon Dec 05 2011 - 12:30:15 EST


Forgot the signature...I'll sign this one, just in case! :-)

John

On Mon, Dec 05, 2011 at 11:30:32AM -0500, John W. Linville wrote:
> commit cbec0627ef1adf7afa448e8bbae3146ce910212a
>
> Dave,
>
> This batch of fixes is intended for 3.2.
>
> Included is an iwlwifi fix to correctly set some flags related to packet
> encryption, a couple of cfg80211 regulatory fixes (including one that
> patches a hole created by the earlier "cfg80211: fix regulatory NULL
> dereference"), a mac80211 fix to avoid sending probe requests with no
> supported rates included, an iwlwifi fix to prevent reconfiguring HT40
> after an association (prevents an assert in the firmware), and another
> iwlwifi fix that customizes the watchdog timer enablement based on the
> device type.
>
> Also included is a reversion of a patch that was causing the iwlegacy
> driver to throw WARNINGs.
>
> Please let me know if there are problems!
>
> John
>
> ---
>
> The following changes since commit f61759e6b831a55b89e584b198c3da325e2bc379:
>
> ipv4: make sure RTO_ONLINK is saved in routing cache (2011-12-03 01:32:23 -0500)
>
> are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
>
> Johannes Berg (1):
> iwlagn: fix HW crypto for TX-only keys
>
> John W. Linville (2):
> Revert "mac80211: clear sta.drv_priv on reconfiguration"
> Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
>
> Luis R. Rodriguez (2):
> cfg80211: fix race on init and driver registration
> cfg80211: amend regulatory NULL dereference fix
>
> Simon Wunderlich (1):
> mac80211: fill rate filter for internal scan requests
>
> Wey-Yi Guy (2):
> iwlwifi: do not re-configure HT40 after associated
> iwlwifi: change the default behavior of watchdog timer
>
> drivers/net/wireless/iwlwifi/iwl-1000.c | 1 +
> drivers/net/wireless/iwlwifi/iwl-5000.c | 1 +
> drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 36 ++++++++++++-------
> drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 5 ---
> drivers/net/wireless/iwlwifi/iwl-agn.c | 34 +++++++++---------
> drivers/net/wireless/iwlwifi/iwl-agn.h | 2 +
> drivers/net/wireless/iwlwifi/iwl-core.c | 22 +++++++++---
> drivers/net/wireless/iwlwifi/iwl-core.h | 2 +
> drivers/net/wireless/iwlwifi/iwl-shared.h | 4 +-
> net/mac80211/main.c | 6 +++
> net/mac80211/util.c | 1 -
> net/wireless/reg.c | 49 +++++++++++++++++----------
> 12 files changed, 102 insertions(+), 61 deletions(-)

--
John W. Linville Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx might be all we have. Be ready.

Attachment: pgp00000.pgp
Description: PGP signature