From patchwork Tue Sep 24 07:59:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1166444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46ctvk5sZfz9sP3; Tue, 24 Sep 2019 18:02:26 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iCfmA-0000jd-Cw; Tue, 24 Sep 2019 08:02:22 +0000 Received: from mail-pf1-f193.google.com ([209.85.210.193]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iCfm4-0000gw-Vb for kernel-team@lists.ubuntu.com; Tue, 24 Sep 2019 08:02:17 +0000 Received: by mail-pf1-f193.google.com with SMTP id h195so827224pfe.5 for ; Tue, 24 Sep 2019 01:02:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CYSrj32vmTqoFxGgBhANA2RgIIKWAL/BjihbhP61JOk=; b=fQYCyGvWr9gTzQAyvtqMRPyXN9qHFYCgCGPpL7CQ1kmV9mAiJboabE8MlYNv3nfa5q 6rQ3M/L+GMVUdDpsTirmGOSlUXkS1dHNdH1MhEW4LKvqZVo60ID5jkjofQ6akxPNq6bi WNmDg7YH9sJaiH8m2kx5K2gTYABvrFTuticVTR/YsZiig3UncWVSaAECdXao/tNYxbsu PQTSuCvA4mxZHLltoBvefzfYlEnmuWbT4qXdmTlexzqWaAOinL6CwEntCNJEAS9Z8Tq+ ZCjdTUEIsdLl+MAXSghzC4wv1FBZpJjQu1ZHuLJSDpBrHV+m+WSvGhW0v+6SXNroZLt9 AAoA== X-Gm-Message-State: APjAAAUA5aVtzV49KRVVa936Ulnqlub4V33+WDS1rPE9RtG9GOKU7Hpj 7uDbPlkJI/Nfgi7zfauCGfFKAKI6 X-Google-Smtp-Source: APXvYqw/t36KyRxQW+zWgdL6ZWVTTpKiRXrpJ7OKb0YFFpJ79lMh89QKsanXYN+hrVu9f/WFbJ57Jg== X-Received: by 2002:a62:2ac9:: with SMTP id q192mr1947974pfq.189.1569312135163; Tue, 24 Sep 2019 01:02:15 -0700 (PDT) Received: from localhost.localdomain (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id g202sm1359780pfb.155.2019.09.24.01.02.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Sep 2019 01:02:14 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 20/21][SRU][OEM-OSP1-B] iwlwifi: mvm: support multiple BSSID Date: Tue, 24 Sep 2019 15:59:46 +0800 Message-Id: <20190924075947.33954-21-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190924075947.33954-1-vicamo.yang@canonical.com> References: <20190924075947.33954-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Sara Sharon BugLink: https://bugs.launchpad.net/bugs/1845138 Set the capabilities flags and inform firmware Signed-off-by: Sara Sharon Signed-off-by: Luca Coelho (cherry picked from commit 918cbf39ac008b8079748a04be69930068c7c7c5) Signed-off-by: You-Sheng Yang --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index dac96b00e9d2f..9b54e79e14127 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -426,6 +426,7 @@ int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm) const static u8 he_if_types_ext_capa_sta[] = { [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, + [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF, [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT, }; @@ -738,6 +739,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) hw->wiphy->iftype_ext_capab = he_iftypes_ext_capa; hw->wiphy->num_iftype_ext_capab = ARRAY_SIZE(he_iftypes_ext_capa); + + ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID); + ieee80211_hw_set(hw, SUPPORTS_ONLY_HE_MULTI_BSSID); } mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD; @@ -2314,7 +2318,11 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, (vif->bss_conf.uora_ocw_range >> 3) & 0x7; } - /* TODO: support Multi BSSID IE */ + if (vif->bss_conf.nontransmitted) { + flags |= STA_CTXT_HE_REF_BSSID_VALID; + ether_addr_copy(sta_ctxt_cmd.ref_bssid_addr, + vif->bss_conf.transmitter_bssid); + } sta_ctxt_cmd.flags = cpu_to_le32(flags);