From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A05C7C76186 for ; Wed, 24 Jul 2019 20:22:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A1132166E for ; Wed, 24 Jul 2019 20:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563999774; bh=gpkOniK76Sb8jC7RArcrweh848Ov1osMfJvD3t4jypE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hqrBK6nTxIHt9OLzzoIwz91a3FrsceiRzEnAFmNr4MZMpdOL9+FtQwhcYesznozj4 Jz3qS7OLwy5/d7p895IFB2O4ASAvdMUPOntd2mOmofw/d210BRCcUbg3EWYgIb9Inc +nhKzUIoPf5jCGIFq0vgRaIeh/zYFHouj7h+wnW0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390527AbfGXTnW (ORCPT ); Wed, 24 Jul 2019 15:43:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:45510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389600AbfGXTnV (ORCPT ); Wed, 24 Jul 2019 15:43:21 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9CFF72083B; Wed, 24 Jul 2019 19:43:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997401; bh=gpkOniK76Sb8jC7RArcrweh848Ov1osMfJvD3t4jypE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qM+dj3p0udsEzSnWTMbUgKSstdFrtHZMip7imOUNHdupg/k78gkzkCPWc+HBIZckB NcpiOGZVfcnTE+j8xJmbtm/LopUjCyXMaxWnkThb9njLt+WT645gYMqpzGsyvgX5i/ XMlKksT0P04z6IzA8BQrQe6ucj4XJ6vWBbm8Zsd4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Surabhi Vishnoi , Kalle Valo , Sasha Levin Subject: [PATCH 5.1 011/371] ath10k: Do not send probe response template for mesh Date: Wed, 24 Jul 2019 21:16:03 +0200 Message-Id: <20190724191725.353275865@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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 Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath10k/mac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index e8997e22ceec..b500fd427595 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -1630,6 +1630,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"); -- 2.20.1