From: Jes Sorensen <Jes.Sorensen@xxxxxxxxxx> Hi Greg, Please find attached another round of cleanups, removal of dead code, and tidying up most of the #ifdef CONFIG_8723AU_BT_COEXIST mess. Notably patch 10 fixes an OOPS case if a user tries to add a monitor interface - monitor mode still doesn't work, but at least it doesn't wedge the kernel. This one could go for 3.15, but it's not a common use case. Cheers, Jes Jes Sorensen (48): staging: rtl8723au: ieee80211.h: Remove some unused #defines staging: rtl8723au: Use ieee80211.h defines for IV/ICV len values staging: rtl8723au: rtw_xmit.c: Use ether_addr_copy() staging: rtl8723au: Don't explicitly check check_fwstate() == true staging: rtl8723au: Make check_fwstate() return bool staging: rtl8723au: Don't check check_fwstate() == false staging: rtl8723au: Remove unused enum SCAN_RESULT_TYPE staging: rtl8723au: rtw_mlme.h: Remove a bunch of unused structs staging: rtl8723au: Remove unused struct hostapd_priv staging: rtl8723au: Do not call netdev_open23a() from cfg80211_rtw_change_iface() staging: rtl8723au: ioctl_cfg80211.c: Use ether_addr_copy() staging: rtl8723au: ioctl_cfg80211.c: Use ether_addr_equal() staging: rtl8723au: Delete unused rtw_cfg80211_set_mgnt_wpsp2pie() staging: rtl8723au: _cfg80211_rtw_mgmt_tx() clean up checking function return values staging: rtl8723au: Get rid of unused struct rtw_wdev_invit_info staging: rtl8723au: struct rtw_wdev_priv: Remove some never 'true' variables staging: rtl8723au: Remove some pointless cfg80211_* wrapper macros staging: rtl8723au: rtw_wdev_alloc(): Don't register wiphy before kmalloc() completed staging: rtl8723au: Remove unused prototype rtw_cfg80211_issue_p2p_provision_request23a() staging: rtl8723au: bInternalAutoSuspend is always false staging: rtl8723au: _rtw_pwr_wakeup23a(): Do not mix _FAIL/false as return value staging: rtl8723au: PS_RDY_CHECK() return bools in 'bool' staging: rtl8723au: Create rtl8723au_bt_intf.h staging: rtl8723au: Convert BT_IsBtDisabled() into rtl8723a_BT_enabled() staging: rtl8723au: Introduce rtl8723a_BT_coexist() - and use it! staging: rtl8723au: Remove some CONFIG_8723AU_BT_COEXIST clutter staging: rtl8723au: Rename BTDM_Coexist() to rtl8723a_BT_do_coexist() staging: rtl8723au: Rename BT_WifiScanNotify() rtl8723a_BT_wifiscan_notify() staging: rtl8723au: Rename BT_WifiMediaStatusNotify() rtl8723a_BT_mediastatus_notify() staging: rtl8723au: Rename BTDM_ForDhcp() to rtl8723a_BT_specialpacket_notify() staging: rtl8723au: Rename BT_LpsLeave() rtl8723a_BT_lps_leave() staging: rtl8723au: rtw_cmd.c: Remove last #ifdef CONFIG_8723AU_BT_COEXIST usage staging: rtl8723au: rtw_pwrctrl.c: Remove an unnecessary COEXIST #ifdef staging: rtl8723au: rtw_pwrctrl.c: Eliminate CONFIG_8723AU_BT_COEXIST #ifdefs staging: rtl8723au: rtw_mlme_ext.c: Remove CONFIG_8723AU_BT_COEXIST #ifdefs staging: rtl8723au: rtw_mlme_ext.c: Sanitize calls to alloc_mgtxmitframe23a() staging: rtl8723au: odm.c: Rename BTDM_DisableEDCATurbo() to rtl8723a_BT_disable_EDCA_turbo() staging: rtl8723au: Move rtl8723a_dual_antenna_detection() to rtl8723a_bt-coexist.c staging: rtl8723au: Rename HALBT_InitHwConfig() rtl8723a_BT_init_hwconfig() staging: rtl8723au: usb_halinit.c: Remove no-op HAL_INIT_PROFILE_TAG() staging: rtl8723au: rtl8732au_hal_init.c: Use rtl8723au_BT_coexist() to pick firmware image staging: rtl8723au: Rename BT_WifiAssociateNotify() rtl8723a_BT_wifiassociate_notify() staging: rtl8723au: Make rtl8723a_set_BTCoex_AP_mode_FwRsvdPkt_cmd() a no-op when no co-exist enabled staging: rtl8723au: Rename HALBT_InitBTVars8723A() rtl8723a_BT_init_hal_vars() staging: rtl8723au: rtl8723a_bt-coexist.c: Remove unnecessary #ifdef CONFIG_8723AU_BT_COEXIST staging: rtl8723au: Rename BTDM_FwC2hBtInfo8723A() to rtl8723a_fw_c2h_BT_info() staging: rtl8723au: Remove unused struct btdata_info staging: rtl8723au: _InitQueueReservedPage(): Remove pointless brackets drivers/staging/rtl8723au/core/rtw_cmd.c | 99 +++---- drivers/staging/rtl8723au/core/rtw_ioctl_set.c | 27 +- drivers/staging/rtl8723au/core/rtw_led.c | 48 ++-- drivers/staging/rtl8723au/core/rtw_mlme.c | 6 +- drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 60 ++--- drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 47 ++-- drivers/staging/rtl8723au/core/rtw_recv.c | 41 ++- drivers/staging/rtl8723au/core/rtw_xmit.c | 56 ++-- drivers/staging/rtl8723au/hal/hal_com.c | 15 +- drivers/staging/rtl8723au/hal/odm.c | 4 +- .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 167 ++++++------ drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 85 ++---- drivers/staging/rtl8723au/hal/usb_halinit.c | 102 +++----- drivers/staging/rtl8723au/include/drv_types.h | 4 - drivers/staging/rtl8723au/include/ieee80211.h | 10 - drivers/staging/rtl8723au/include/ioctl_cfg80211.h | 46 ---- .../rtl8723au/include/rtl8723a_bt-coexist.h | 26 -- .../staging/rtl8723au/include/rtl8723a_bt_intf.h | 69 +++++ drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 2 + drivers/staging/rtl8723au/include/rtl8723a_hal.h | 5 +- drivers/staging/rtl8723au/include/rtw_mlme.h | 82 +----- drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 1 - drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 286 ++++----------------- drivers/staging/rtl8723au/os_dep/os_intfs.c | 4 - drivers/staging/rtl8723au/os_dep/usb_intf.c | 11 +- 25 files changed, 436 insertions(+), 867 deletions(-) create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h -- 1.9.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel