Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1840001pxj; Sat, 5 Jun 2021 04:52:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxloPKHNMVw20Uv6Ho7LGmKrfLEsEMv54rrCoNAHBNnooCkt3y4/LltsAQKmI15sRUQz6lF X-Received: by 2002:aa7:dd14:: with SMTP id i20mr10107152edv.110.1622893924017; Sat, 05 Jun 2021 04:52:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622893924; cv=none; d=google.com; s=arc-20160816; b=Sm3Rj6IdNEyQGJh/uROz9V/YF0GrWu97Pyv+NAmGxu8Jc+x5r4WHX7ROZD5V3TOVyv hs+w2HoFyFUjw1/+jrJmjtka+2VA1QYcTHGehmiTJ0xLziZdYCOfXJ5wvMuQKAqHAt+h eC08oWRRXvp/LVpXbN0yVo83aVGb/DdW3iRfFZ3wIIPb1WQsqHYmte63XJaDiy43/1A4 sSNq7sOoH4sIkUKKiWN/I7q8hkYDGVwMXii78MMoFk/Z5DP8E9ZzyaQfWp4sB2r54HT5 hX7+H/FHWa6ySEQkMkcZcNSCrcqV8ArAqdQRes3O9JgJh4zfQkQVoG0NTO1jHzpBsFny zRng== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=c9SOsvQrlEgZqaLxA+1qjbcCRfS/9IW36xhf2Qttf+E=; b=bxa1uK6OGDaw6ryMMdgMFAGe3Qt9QTgt8niCnnqD8Wm5urL2+nsf6TiU3e+0LfnqVp bSma4rhb7DtzTzxlJXeEbuUv0r8ZZ1j9KS0XVWmHxmTYu8TOf16XKDfgGmYByQB112lX F8PBxCiBxeZlYQA46zWq3NB+L52+h/v4Vbpa+KlH9cQG2Kv1g08qddakwUDNYwyJE2Mq 9mDqRfUsUFUYmnbCj4+TpEx9Dif5PSuB7PPfOuZk73fnnsV+4sDVNRSw4cCY9RKNJ+s/ KB30GRgg2SdNqlQgOnE867+ruVr/0OYN0ltJOOn4XqyiWWnqyRckUByqDXpNRVl5Vte1 HHbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ihOdE62F; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n2si3307732edb.238.2021.06.05.04.51.41; Sat, 05 Jun 2021 04:52:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ihOdE62F; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230188AbhFELwu (ORCPT + 99 others); Sat, 5 Jun 2021 07:52:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:52642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbhFELwt (ORCPT ); Sat, 5 Jun 2021 07:52:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B1EA46120F; Sat, 5 Jun 2021 11:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622893861; bh=Eilo8NFrwPdpRnnnjrYuFbE9+5zvWrsHhSVToWZxdFA=; h=From:To:Cc:Subject:Date:From; b=ihOdE62FbQyo3GC146jj9AnyqVmoZFDTDkUK2org6ZtvP5QK1UGZYYIZlGdpnllNz c88c206JDVOCXcnueoSRKZi3eu3DSIdVtwl2J0ndzKYXINfpkTsfoEqwSiSvG6nzuq ERlpHPiaRSXhghIT/QcQAD2TReZ5CHQN+PEvwpPB9IxiT5pI6hVFq7N3ni1d5T2Vze QtZB6rfAqqYlifCAits1K1YWzTbJpDEtVH4lWHrOf6UZtjZu+35IPM6Qk9GPo0+eF/ 9CqiqJVFTJILiHVi2a5Z59fKG6k2m3mRntjhz46kyUmK+USl8n65gYRz8NLLZW/rh0 1tLPt5PoicU0A== From: Lorenzo Bianconi To: nbd@nbd.name Cc: lorenzo.bianconi@redhat.com, linux-wireless@vger.kernel.org, deren.wu@mediatek.com, sean.wang@mediatek.com Subject: [PATCH] mt76: connac: check band caps in mt76_connac_mcu_set_rate_txpower Date: Sat, 5 Jun 2021 13:50:52 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Check device band capabilities before configuring single-sku Signed-off-by: Lorenzo Bianconi --- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 1dfdc90985c6..2325eefbeb2a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -1769,11 +1769,20 @@ int mt76_connac_mcu_set_rate_txpower(struct mt76_phy *phy) { int err; - err = mt76_connac_mcu_rate_txpower_band(phy, NL80211_BAND_2GHZ); - if (err < 0) - return err; + if (phy->cap.has_2ghz) { + err = mt76_connac_mcu_rate_txpower_band(phy, + NL80211_BAND_2GHZ); + if (err < 0) + return err; + } + if (phy->cap.has_5ghz) { + err = mt76_connac_mcu_rate_txpower_band(phy, + NL80211_BAND_5GHZ); + if (err < 0) + return err; + } - return mt76_connac_mcu_rate_txpower_band(phy, NL80211_BAND_5GHZ); + return 0; } EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_rate_txpower); -- 2.31.1