From: Ping-Ke Shih <pkshih@xxxxxxxxxxx> Fix some bugs reported by QC, and continue to submit btcoex patches for further use. v3: * remove the commit that adds sta_statistics op, because Johannes fixes it in cfg80211 (Thanks!) * for 'typedef' comment, add a commit to resolve old typedef, and remove typedef from the commit "rtlwifi: btcoex: Add common function for qeurying BT information" v2: * add my sob to commit log if missing, and remove trivial comments. Larry Finger (1): rtlwifi: btcoex: Remove typedef statements Ping-Ke Shih (7): rtlwifi: Use mutex to replace spin_lock to protect IPS and LPS rtlwifi: fix scan channel 1 fail after IPS rtlwifi: enable mac80211 fast-tx support rtlwifi: btcoex: Add power_on_setting routine rtlwifi: btcoex: Remove global variables from btcoex rtlwifi: btcoex: Add common function for qeurying BT information rtlwifi: btcoex: add rfe_type parameter to btcoex Steven Ting (1): rtlwifi: Support A-MSDU in A-MPDU capability Tsang-Shian Lin (1): rtlwifi: unlink bss when un-association drivers/net/wireless/realtek/rtlwifi/base.c | 9 +- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 398 +++++++++++++++++---- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 178 +++++---- .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 234 ++++++++++-- .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.h | 4 +- drivers/net/wireless/realtek/rtlwifi/core.c | 24 ++ drivers/net/wireless/realtek/rtlwifi/pci.c | 5 +- drivers/net/wireless/realtek/rtlwifi/ps.c | 29 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 1 - drivers/net/wireless/realtek/rtlwifi/wifi.h | 16 +- 10 files changed, 694 insertions(+), 204 deletions(-) -- 2.15.1