mirror of
https://github.com/chinawrj/rtl8812au
synced 2024-11-27 15:44:18 +00:00
Fixed 8821au (8811au) support, fixed fw bug. fixes #466
This commit is contained in:
parent
af1ffffa98
commit
b5f97c1696
@ -510,6 +510,8 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, const u8 *hwaddr)
|
||||
} else {
|
||||
psta = LIST_CONTAINOR(get_next(&pfree_sta_queue->queue), struct sta_info, list);
|
||||
|
||||
if (!psta)
|
||||
goto exit;
|
||||
rtw_list_delete(&(psta->list));
|
||||
|
||||
/* _exit_critical_bh(&(pfree_sta_queue->lock), &irqL); */
|
||||
|
@ -18,7 +18,8 @@
|
||||
#include <rtl8812a_hal.h>
|
||||
#ifdef CONFIG_RTL8812A
|
||||
#include "hal8812a_fw.h"
|
||||
#else
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8821A
|
||||
#include "hal8821a_fw.h"
|
||||
#endif
|
||||
/* -------------------------------------------------------------------------
|
||||
@ -517,11 +518,16 @@ FirmwareDownload8812(
|
||||
#ifdef CONFIG_WOWLAN
|
||||
if (pwrpriv->wowlan_mode) {
|
||||
#ifdef CONFIG_RTL8812A
|
||||
if (IS_HARDWARE_TYPE_8812(Adapter)) {
|
||||
pFirmware->szFwBuffer = array_mp_8812a_fw_wowlan;
|
||||
pFirmware->ulFwLength = array_length_mp_8812a_fw_wowlan;
|
||||
#else
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8821A
|
||||
if (IS_HARDWARE_TYPE_8821(Adapter)) {
|
||||
pFirmware->szFwBuffer = array_mp_8821a_fw_wowlan;
|
||||
pFirmware->ulFwLength = array_length_mp_8821a_fw_wowlan;
|
||||
}
|
||||
#endif
|
||||
RTW_INFO("%s fw:%s, size: %d\n", __func__, "WoWLAN", pFirmware->ulFwLength);
|
||||
|
||||
@ -531,11 +537,16 @@ FirmwareDownload8812(
|
||||
#ifdef CONFIG_AP_WOWLAN
|
||||
if (pwrpriv->wowlan_ap_mode) {
|
||||
#ifdef CONFIG_RTL8812A
|
||||
if (IS_HARDWARE_TYPE_8812(Adapter)) {
|
||||
pFirmware->szFwBuffer = array_mp_8812a_fw_ap;
|
||||
pFirmware->ulFwLength = array_length_mp_8812a_fw_ap;
|
||||
#else
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8821A
|
||||
if (IS_HARDWARE_TYPE_8821(Adapter)) {
|
||||
pFirmware->szFwBuffer = array_mp_8821a_fw_ap;
|
||||
pFirmware->ulFwLength = array_length_mp_8821a_fw_ap;
|
||||
}
|
||||
#endif
|
||||
|
||||
RTW_INFO("%s fw: %s, size: %d\n", __func__, "AP_WoWLAN", pFirmware->ulFwLength);
|
||||
@ -546,11 +557,16 @@ FirmwareDownload8812(
|
||||
if (pHalData->EEPROMBluetoothCoexist == _TRUE) {
|
||||
|
||||
#ifdef CONFIG_RTL8812A
|
||||
if (IS_HARDWARE_TYPE_8812(pAdapter)) {
|
||||
pFirmware->szFwBuffer = array_mp_8812a_fw_nic_bt;
|
||||
pFirmware->ulFwLength = array_length_mp_8812a_fw_nic_bt;
|
||||
#else
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8821A
|
||||
if (IS_HARDWARE_TYPE_8821(pAdapter)) {
|
||||
pFirmware->szFwBuffer = array_mp_8821a_fw_nic_bt;
|
||||
pFirmware->ulFwLength = array_length_mp_8821a_fw_nic_bt;
|
||||
}
|
||||
#endif
|
||||
|
||||
RTW_INFO("%s fw:%s, size: %d\n", __FUNCTION__, "NIC-BTCOEX", pFirmware->ulFwLength);
|
||||
@ -559,11 +575,16 @@ FirmwareDownload8812(
|
||||
{
|
||||
|
||||
#ifdef CONFIG_RTL8812A
|
||||
if (IS_HARDWARE_TYPE_8812(Adapter)) {
|
||||
pFirmware->szFwBuffer = array_mp_8812a_fw_nic;
|
||||
pFirmware->ulFwLength = array_length_mp_8812a_fw_nic;
|
||||
#else
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8821A
|
||||
if (IS_HARDWARE_TYPE_8821(Adapter)) {
|
||||
pFirmware->szFwBuffer = array_mp_8821a_fw_nic;
|
||||
pFirmware->ulFwLength = array_length_mp_8821a_fw_nic;
|
||||
}
|
||||
#endif
|
||||
|
||||
RTW_INFO("%s fw:%s, size: %d\n", __FUNCTION__, "NIC", pFirmware->ulFwLength);
|
||||
|
@ -2638,10 +2638,17 @@ void rtw_cfg80211_unlink_bss(_adapter *padapter, struct wlan_network *pnetwork)
|
||||
select_network.InfrastructureMode == Ndis802_11Infrastructure?WLAN_CAPABILITY_ESS:WLAN_CAPABILITY_IBSS);
|
||||
#endif
|
||||
|
||||
if (!wiphy) {
|
||||
pr_info("88XXAU: rtw_cfg80211_unlink_bss: wiphy is NULL\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (bss) {
|
||||
cfg80211_unlink_bss(wiphy, bss);
|
||||
RTW_INFO("%s(): cfg80211_unlink %s!!\n", __func__, select_network.Ssid.Ssid);
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
|
||||
if (!padapter->rtw_wdev->wiphy)
|
||||
return;
|
||||
cfg80211_put_bss(padapter->rtw_wdev->wiphy, bss);
|
||||
#else
|
||||
cfg80211_put_bss(bss);
|
||||
|
Loading…
Reference in New Issue
Block a user