Hi John, This is another pull request intended for 3.4. It contains a few fixes that were still pending in our internal tree and alignment with the latest mac80211/cfg80211 code. Nothing major. Please pull or let me know if there's any problem. This tree is based on wireless-next/master and the head I want you to pull from is cc4bf501a237f5232df6d4aeb7b24ac0362958c8. Thanks! The following changes since commit 41b58f189ada1a12d3c9417c3eedd5b910d8d09f: rtl8187: Add AD-HOC support (2012-03-07 13:56:37 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git for-linville Arik Nemtsov (8): wl12xx: set the ELP entry delay to the FW dyn-ps timeout wl12xx: change bits in the link_map under spin lock wl12xx: reset link Tx queues when freeing it wl12xx: avoid starving the system hlid wl12xx: flush all Tx queues on tx_flush timeout wl12xx: flush Tx during suspend and 802.11h chan switch wl12xx: increase dynamic PS timeout to 200ms wl12xx: implement SW Tx watchdog Eliad Peller (11): wl12xx: don't start dev role on ibss vifs wl12xx: consider bss_conf->idle instead of hw->conf.flags wl12xx: implement sta_state callback wl12xx: set authorized AP on sta_state notification wl12xx: increment session_counter for device role as well wl12xx: set correct vif type in change_interface callback wl12xx: don't handle change_channel while associated wl12xx: don't allow scanning while device is in ROC wl12xx: configure the correct beacon_interval wl12xx: avoid bug_on_recovery during fw switch wl12xx: print the tx packet len Luciano Coelho (1): Merge branch 'wl12xx-next' into for-linville drivers/net/wireless/wl12xx/cmd.c | 26 ++- drivers/net/wireless/wl12xx/conf.h | 3 + drivers/net/wireless/wl12xx/main.c | 438 +++++++++++++++++++--------------- drivers/net/wireless/wl12xx/ps.c | 4 +- drivers/net/wireless/wl12xx/scan.c | 6 + drivers/net/wireless/wl12xx/tx.c | 41 +++- drivers/net/wireless/wl12xx/tx.h | 1 + drivers/net/wireless/wl12xx/wl12xx.h | 7 +- 8 files changed, 321 insertions(+), 205 deletions(-) -- Cheers, Luca.
Attachment:
signature.asc
Description: This is a digitally signed message part