Commit 3f6e6c32 authored by Kalle Valo's avatar Kalle Valo
Browse files

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: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1601399736-3210-6-git-send-email-kvalo@codeaurora.org
parent 18ac1665

drivers/net/wireless/ath/ath11k/core.c

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP) |

					BIT(NL80211_IFTYPE_MESH_POINT),

		.supports_monitor = true,

	},

	{

		.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) |

					BIT(NL80211_IFTYPE_AP) |

					BIT(NL80211_IFTYPE_MESH_POINT),

		.supports_monitor = true,

	},

	{

		.name = "qca6390 hw2.0",
@@ -129,6 +131,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 


		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP),

		.supports_monitor = false,

	},

};

drivers/net/wireless/ath/ath11k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ struct ath11k_hw_params { 
	u8 spectral_fft_sz;



	u16 interface_modes;

	bool supports_monitor;

};



struct ath11k_hw_ops {

drivers/net/wireless/ath/ath11k/mac.c

+8 −0
Original line number Diff line number Diff line
@@ -6248,6 +6248,14 @@ static int __ath11k_mac_register(struct ath11k *ar) 
		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 */

	ret = ath11k_regd_update(ar, true);

	if (ret) {