Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp210208rwl; Wed, 29 Mar 2023 00:08:19 -0700 (PDT) X-Google-Smtp-Source: AKy350b7JmN1odM67GB361onts3gBys2mVF+QDOQVyJg4uTd0q/Hx65trBcpLLkqxPxbBrrmRTbz X-Received: by 2002:a17:903:805:b0:1a2:6138:c32e with SMTP id kr5-20020a170903080500b001a26138c32emr4520647plb.18.1680073699565; Wed, 29 Mar 2023 00:08:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680073699; cv=none; d=google.com; s=arc-20160816; b=WmSglA9NXXi9+VnzqoFwn+LiNY9Xb1kgkbEeZd7Sam2lw0dLtlKn64Sw7BnW8mWUrb c8EIdcN9jL2yR2gHd7PWxLe2CTn2BH4eVg5JjZf7+Flipc6wGg2OfmB6MTD6Ag+1vAJp 5TCtvCkMQ8qcI5BpMEVuR6wC9ZB0a9bIRiWDGOEiBUKQSr1ZXP+Uv2pCfmAi9KXX6PPu fPjyC1vLM0VnQlnux4vubVQ9qfXl0qa6jtMRPXCgvt2M3JrR2za9WX+/uhLk0HoYenBa bCtGUb+7u1yPNovvCQ/a2fu0x+bP8zuzHNNE6Lr+jVxfCrWT5jYrSF/Lq8juOzET6xRz qJug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=u5/Hlpstg5wC0s5FEK8zZUsEY4TXLzIc9OnVqBmN+GY=; b=HYBPMINr++kfbcdsXLnOv7XAwqlFEsAnpD4jkJDAJ2NQDguFoseAhEtTWTczmbIju9 Hfaeh02wbY8eDrrvYWz3/JGxvCxbYtFAa3R1KW44Srt+ks/WDkypciX3RiYPciCMPLMn Sq+HCIinJwYzAWFTcHBVg/iUYVFsNSyQ5YlMlRN4YWrwd4PM3lffeBBWXjIgow3ofnMt OsjlEerh5inJo8IjRu3vGnaFzAn/kG0z6csUoGqRc9MHXbXgOD/jIaYyD/FKYyUzwCqn /5EkwAEe4gm6MYy13BvVQ4sPp17KaSWSSzBZkyYuX7LMYcQIfhGhMmF3vQgeivxkNiiJ hApQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=T6FeYGgi; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q14-20020a170902dace00b0019468fe44d5si33286983plx.233.2023.03.29.00.08.11; Wed, 29 Mar 2023 00:08:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=T6FeYGgi; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229704AbjC2HGe (ORCPT + 60 others); Wed, 29 Mar 2023 03:06:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229663AbjC2HGc (ORCPT ); Wed, 29 Mar 2023 03:06:32 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 485D326BA for ; Wed, 29 Mar 2023 00:06:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680073565; x=1711609565; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=seXxOB7EUKqd3T5L4CqZXbXCuRQvSL2K/8Vu7CyrZEY=; b=T6FeYGgiUje7HRzmgZ6C9Uu74Bst5WDtapW+iDDKSHD9PZFbFT7+L0M8 hxuc3shYXTGyks8NxGQYRb5r6HiGSqw2CzjBLE7/2HtzKjqMxEsXpgyM6 4gtY7JS0Hh7n9PQGn5cGHFx3uSeDJE3MS4oKlGXfdebfjEVQrbj71ZnGB bHlROo40X2nSGbAa53YB3EWkDw5hyR7ywl5ZiP8vCt1FCTTXyoHjX4QpO T4OGet02feIIlqg4l7tzHiLsBMHUW6vETevbGRqwBw2Is+JojU4nys6cU M7Ilu9eHTQqTKNOMUiYAm+yi1WvTIxgDX3WgGE42AEI3KodFhqz/BZ9E9 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="320450704" X-IronPort-AV: E=Sophos;i="5.98,300,1673942400"; d="scan'208";a="320450704" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2023 00:05:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="795111148" X-IronPort-AV: E=Sophos;i="5.98,300,1673942400"; d="scan'208";a="795111148" Received: from sfrank1-mobl1.ger.corp.intel.com (HELO ggreenma-mobl2.intel.com) ([10.214.228.42]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2023 00:05:58 -0700 From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg , Gregory Greenman Subject: [PATCH 03/34] wifi: iwlwifi: mvm: skip MEI update for MLO Date: Wed, 29 Mar 2023 10:05:09 +0300 Message-Id: <20230329100039.aeaa746b14e7.I42b084f3cdc20bb52cf867700a3c2e1f5e7b4ecb@changeid> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230329070540.2739372-1-gregory.greenman@intel.com> References: <20230329070540.2739372-1-gregory.greenman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg For now, if using MLO, skip the MEI update. It probably needs new API for multiple channels. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 9eb95ed48d02..294e1c1de6b6 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -3464,7 +3464,6 @@ static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm, struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); struct iwl_mei_conn_info conn_info = { .ssid_len = vif->cfg.ssid_len, - .channel = vif->bss_conf.chandef.chan->hw_value, }; if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) @@ -3473,6 +3472,12 @@ static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm, if (!mvm->mei_registered) return; + /* FIXME: MEI needs to be updated for MLO */ + if (!vif->bss_conf.chandef.chan) + return; + + conn_info.channel = vif->bss_conf.chandef.chan->hw_value; + switch (mvm_sta->pairwise_cipher) { case WLAN_CIPHER_SUITE_TKIP: conn_info.pairwise_cipher = IWL_MEI_CIPHER_TKIP; -- 2.38.1