From patchwork Thu Jun 4 07:09:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 11587027 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA7C5913 for ; Thu, 4 Jun 2020 07:10:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A808E206DC for ; Thu, 4 Jun 2020 07:10:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="vD7PpWa9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A808E206DC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=phrozen.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=z6Xzwp6GdRKACVTPfSMhqmkhggMOOu59SJL0jnBucZ8=; b=vD7PpWa9B/qa+R 9znjAmoNaiqCsX833k+a6XoW6ts1+A0LpMxbrybYdD1tFRcLx9EGMb1rw8sK/mXNvUFrLe9JC9eof FP/2QkZEN4ddxxteOqNzvpsoPJ2mXAvONJ+XgNVI7g50CKB9JkZqZmSZEePgRItczWqag5SdmOfaq 5NmQVKdJm6cVj4aStWmILpJA8qAS09HPbUX/EOGeqo5VXMx/LkMdqp7mICECQB+6j3rbrLZyLT4zM o0R2RReoZJfkm8ZBucGMW22A7XDOzlUGaRrbgJKNF2wMZCYyyQftfGhvf5Uq0OL9VfkpXKi5d12XB y9WDPnggrmVsVOlopmkw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jgk0x-00018H-2X; Thu, 04 Jun 2020 07:10:11 +0000 Received: from nbd.name ([2a01:4f8:221:3d45::2]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jgk0p-0000HP-Bl for ath11k@lists.infradead.org; Thu, 04 Jun 2020 07:10:05 +0000 Received: from [46.59.202.224] (helo=localhost.localdomain) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1jgk0l-0001P3-Ox; Thu, 04 Jun 2020 09:09:59 +0200 From: John Crispin To: Johannes Berg Subject: [PATCH 06/12] mac80211: propagate multi bssid settings when starting an AP Date: Thu, 4 Jun 2020 09:09:46 +0200 Message-Id: <20200604070952.15481-7-john@phrozen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200604070952.15481-1-john@phrozen.org> References: <20200604070952.15481-1-john@phrozen.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200604_001003_583128_D7AC3F72 X-CRM114-Status: UNSURE ( 9.04 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, John Crispin Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org This patch extends the bss_config allowing us to propagate the multiple bssid setting down the stack into the driver. Signed-off-by: John Crispin --- include/net/mac80211.h | 2 ++ net/mac80211/cfg.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 1a98b3907aa7..3812adcef7d7 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -606,6 +606,7 @@ struct ieee80211_ftm_responder_params { * @he_operation: HE operation information of the AP we are connected to * @he_obss_pd: OBSS Packet Detection parameters. * @he_bss_color: BSS coloring settings, if BSS supports HE + * @multi_bssid: the multi bssid settings of the AP. */ struct ieee80211_bss_conf { const u8 *bssid; @@ -669,6 +670,7 @@ struct ieee80211_bss_conf { struct ieee80211_he_operation he_operation; struct ieee80211_he_obss_pd he_obss_pd; struct cfg80211_he_bss_color he_bss_color; + struct ieee80211_multi_bssid multi_bssid; }; /** diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index e4f73567d873..f6f7323c66ab 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1130,6 +1130,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, sizeof(struct ieee80211_he_obss_pd)); memcpy(&sdata->vif.bss_conf.he_bss_color, ¶ms->he_bss_color, sizeof(struct ieee80211_he_bss_color)); + memcpy(&sdata->vif.bss_conf.multi_bssid, ¶ms->multi_bssid, + sizeof(struct ieee80211_multi_bssid)); sdata->vif.bss_conf.ssid_len = params->ssid_len; if (params->ssid_len)