openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath11k: disable monitor mode on QCA6390 

QCA6390 does not support monitor mode at the moment so disable it altogether,
using a hack as mac80211 does not support disabling it otherwise. Add a boolean
to hw_params to know if hardware supports monitor mode.

IPQ8074 continues to support monitor mode normally.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1601399736-3210-6-git-send-email-kvalo@codeaurora.org
This commit is contained in:
Kalle Valo 2020-09-29 20:15:33 +03:00
parent 18ac1665e7
commit 3f6e6c3291
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/ath/ath11k/core.c
View File

@ -62,6 +62,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.interface_modes = BIT(NL80211_IFTYPE_STATION) | .interface_modes = BIT(NL80211_IFTYPE_STATION) |
BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_AP) |
BIT(NL80211_IFTYPE_MESH_POINT), BIT(NL80211_IFTYPE_MESH_POINT),
.supports_monitor = true,
}, },
{ {
.hw_rev = ATH11K_HW_IPQ6018_HW10, .hw_rev = ATH11K_HW_IPQ6018_HW10,
@ -96,6 +97,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.interface_modes = BIT(NL80211_IFTYPE_STATION) | .interface_modes = BIT(NL80211_IFTYPE_STATION) |
BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_AP) |
BIT(NL80211_IFTYPE_MESH_POINT), BIT(NL80211_IFTYPE_MESH_POINT),
.supports_monitor = true,
}, },
{ {
.name = "qca6390 hw2.0", .name = "qca6390 hw2.0",
@ -129,6 +131,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.interface_modes = BIT(NL80211_IFTYPE_STATION) | .interface_modes = BIT(NL80211_IFTYPE_STATION) |
BIT(NL80211_IFTYPE_AP), BIT(NL80211_IFTYPE_AP),
.supports_monitor = false,
}, },
}; };

1
drivers/net/wireless/ath/ath11k/hw.h
View File

@ -158,6 +158,7 @@ struct ath11k_hw_params {
u8 spectral_fft_sz; u8 spectral_fft_sz;
u16 interface_modes; u16 interface_modes;
bool supports_monitor;
}; };
struct ath11k_hw_ops { struct ath11k_hw_ops {

8
drivers/net/wireless/ath/ath11k/mac.c
View File

@ -6248,6 +6248,14 @@ static int __ath11k_mac_register(struct ath11k *ar)
goto err_free_if_combs; goto err_free_if_combs;
} }
if (!ab->hw_params.supports_monitor)
/* There's a race between calling ieee80211_register_hw()
* and here where the monitor mode is enabled for a little
* while. But that time is so short and in practise it make
* a difference in real life.
*/
ar->hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR);
/* Apply the regd received during initialization */ /* Apply the regd received during initialization */
ret = ath11k_regd_update(ar, true); ret = ath11k_regd_update(ar, true);
if (ret) { if (ret) {