summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSurabhi Vishnoi2019-04-17 10:31:46 +0200
committerGreg Kroah-Hartman2019-07-26 09:13:57 +0200
commit7e19e658e535d19f3e038a52606e10d5442b936a (patch)
tree37f6179a6115e5fda24ec1408ca7e2579bf3479b
parentwil6210: fix potential out-of-bounds read (diff)
downloadkernel-qcow2-linux-7e19e658e535d19f3e038a52606e10d5442b936a.tar.gz
kernel-qcow2-linux-7e19e658e535d19f3e038a52606e10d5442b936a.tar.xz
kernel-qcow2-linux-7e19e658e535d19f3e038a52606e10d5442b936a.zip
ath10k: Do not send probe response template for mesh
[ Upstream commit 97354f2c432788e3163134df6bb144f4b6289d87 ] Currently mac80211 do not support probe response template for mesh point. When WMI_SERVICE_BEACON_OFFLOAD is enabled, host driver tries to configure probe response template for mesh, but it fails because the interface type is not NL80211_IFTYPE_AP but NL80211_IFTYPE_MESH_POINT. To avoid this failure, skip sending probe response template to firmware for mesh point. Tested HW: WCN3990/QCA6174/QCA9984 Signed-off-by: Surabhi Vishnoi <svishnoi@codeaurora.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/wireless/ath/ath10k/mac.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index f3b1cfacfe9d..1419f9d1505f 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1624,6 +1624,10 @@ static int ath10k_mac_setup_prb_tmpl(struct ath10k_vif *arvif)
if (arvif->vdev_type != WMI_VDEV_TYPE_AP)
return 0;
+ /* For mesh, probe response and beacon share the same template */
+ if (ieee80211_vif_is_mesh(vif))
+ return 0;
+
prb = ieee80211_proberesp_get(hw, vif);
if (!prb) {
ath10k_warn(ar, "failed to get probe resp template from mac80211\n");