Message ID | 20211019162548.1408217-17-vicamo.yang@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HYfKS2X9Jz9sR4 for <incoming@patchwork.ozlabs.org>; Wed, 20 Oct 2021 03:27:24 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1mcrxH-0007GC-Ia; Tue, 19 Oct 2021 16:27:11 +0000 Received: from mail-pj1-f54.google.com ([209.85.216.54]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <vicamo@gmail.com>) id 1mcrwf-0006Zu-MG for kernel-team@lists.ubuntu.com; Tue, 19 Oct 2021 16:26:33 +0000 Received: by mail-pj1-f54.google.com with SMTP id qe4-20020a17090b4f8400b0019f663cfcd1so276084pjb.1 for <kernel-team@lists.ubuntu.com>; Tue, 19 Oct 2021 09:26:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ee1Kn67/el3xTNaXw/05ywTaIsWUmPmBc4yHsH/u1HM=; b=VZ30QRelpZTR3aK5dyovIHvPBcmH2giqPLUbo+BhHl8ZxsXlJj4TRWb31v9pcr+KgW 8TBnP8FPKIR5LmusIePQ8RtVlmevfHzbeOKreoB35ts8Btz57yfvPHBbTqdOjKj0Fpq0 FeMEBAaIg4TLt72cluav2V2ewvNUahsCUCLevXYUthIoHyq9b0mKosyt0HnR+AjQte+9 Q9uI5MDht1nIIXwGM5FlnATCNqGVSAcMcd8NNJw2upouNk8ciyupBdNmfxxZwWvw9HEA rsWuNETGF7Ffb6xHq8zE73k/S3igj975KqUY5vg9N/V1xYIxIiNhZLiqMNdKKfD9sSWk tOdg== X-Gm-Message-State: AOAM532xOPPKektUCkobFGPLX2oHdljJjtUzY724OPov7P5gU8mL9hYx hQ9eTuO0rbw2ODcGRux41siOzeY2jiU= X-Google-Smtp-Source: ABdhPJxc80e51XBF0ZTimNBM32j3RZsRpdlcnhDJ11U1qUQRGjiz6+xvcIHVTat/dpSIb8eMXZQUng== X-Received: by 2002:a17:90b:33cf:: with SMTP id lk15mr864052pjb.204.1634660777415; Tue, 19 Oct 2021 09:26:17 -0700 (PDT) Received: from localhost (220-142-196-159.dynamic-ip.hinet.net. [220.142.196.159]) by smtp.gmail.com with ESMTPSA id k22sm16417571pfi.149.2021.10.19.09.26.16 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 09:26:17 -0700 (PDT) From: You-Sheng Yang <vicamo.yang@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH 16/33][SRU][OEM-5.13] ath11k: re-enable ht_cap/vht_cap for 5G band for WCN6855 Date: Wed, 20 Oct 2021 00:25:31 +0800 Message-Id: <20211019162548.1408217-17-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211019162548.1408217-1-vicamo.yang@canonical.com> References: <20211019162548.1408217-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.54; envelope-from=vicamo@gmail.com; helo=mail-pj1-f54.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
Support Qualcomm WCN685x
|
expand
|
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index bcfb14dac6c58..9808b663b3644 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -3811,7 +3811,9 @@ static void ath11k_mac_setup_ht_vht_cap(struct ath11k *ar, rate_cap_rx_chainmask); } - if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP && !ar->supports_6ghz) { + if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP && + (ar->ab->hw_params.single_pdev_only || + !ar->supports_6ghz)) { band = &ar->mac.sbands[NL80211_BAND_5GHZ]; ht_cap = cap->band[NL80211_BAND_5GHZ].ht_cap_info; if (ht_cap_info)