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,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 57ACEC76186 for ; Wed, 24 Jul 2019 20:08:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21D2D20665 for ; Wed, 24 Jul 2019 20:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998880; bh=aw2hyCYR//DFDIF22zc37GORwOeYBZKCul+rf3DVcMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CdGO6R61aLUtCHnslk2GqrlFBPaq3TmkRup+0uiRtl05gE6U/YABMzV0ZNjEQ8ouJ RMWv4C6FjBiFOSBrNdBF7W0nzKcnJz6z+WGYgD5KFdAdibQkKi/+fr/loKgR0BHaB2 mmbN3HTYCOMjO+jjn7I0STEugJRihYzU4g2CiA9M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405622AbfGXUC4 (ORCPT ); Wed, 24 Jul 2019 16:02:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:53022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405258AbfGXUCz (ORCPT ); Wed, 24 Jul 2019 16:02:55 -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 7EC8C205C9; Wed, 24 Jul 2019 20:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998575; bh=aw2hyCYR//DFDIF22zc37GORwOeYBZKCul+rf3DVcMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xZLSxSavO6IKfb47YXLzoncbefUWqS6SyJjy6KXHsCBuVeksEXPRkUczos6INjLsX 8ojERJkX3avllclfRanIM/E/JvmIXimOKLI+DKEy/HG5cm3gunHeEgOxk6/T7Gk/q2 5Bs7rzs8f6I5KQO0fQVJJ6HKj/aDA5NRXo1vYwhg= 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 4.19 007/271] ath10k: Do not send probe response template for mesh Date: Wed, 24 Jul 2019 21:17:56 +0200 Message-Id: <20190724191655.898566689@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191655.268628197@linuxfoundation.org> References: <20190724191655.268628197@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 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"); -- 2.20.1