Message ID | 20211019162548.1408217-16-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 4HYfKB11Fwz9sR4 for <incoming@patchwork.ozlabs.org>; Wed, 20 Oct 2021 03:27:10 +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 1mcrx1-000719-EW; Tue, 19 Oct 2021 16:26:55 +0000 Received: from mail-pf1-f175.google.com ([209.85.210.175]) 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 1mcrwb-0006Yo-5u for kernel-team@lists.ubuntu.com; Tue, 19 Oct 2021 16:26:29 +0000 Received: by mail-pf1-f175.google.com with SMTP id k26so400550pfi.5 for <kernel-team@lists.ubuntu.com>; Tue, 19 Oct 2021 09:26:18 -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=B/D0pdU6dHSGd4VmoGduG4bnYXREGVkSc5yTxKBHobI=; b=fd4orZXUoCAoXeiyiItBhuSvyPz19MtqsFXRy+l1SWRnGysMxsYBqknf2YsiGQaYDv aF0HaIE1FommsscUmBPR5JXO9oSUCcIwaHYxP1iFHYAJrI3eo6xK9l0dkG2uZiG1/Y/t agsaySO2KXPk/rM3kdUcOXhNv9emLfn/nz7ZKRhiK01DSIGldm3oIC08d9PU+l8GKlFv ORS0NlnBftxJXG04BaSyoJRY64siPQhq0sw+XRKkgIqMX/JdOVzkMAO4zMcsk+DPJ132 Eu1Ybo54nCcH3Bt6NSCn/xODVcqLFCgQb+t8vM8A/Fc5dy2BbkrKHUwRRjC75TLncPQX nXLg== X-Gm-Message-State: AOAM5339fdCzy0yW2I1OFNSF4NgiM0n61mAvzB/wn1ph+rLTlWz5dGPo l1Y588Fl22AyvvfS2KglsuAnO1PxN7M= X-Google-Smtp-Source: ABdhPJyU0pHf1pTkrJ+y3opKtyF4aXxP+zuKNEHlpPkEPTyIcC3XDZSLDeSFCstPGb78S6VU5s8hNA== X-Received: by 2002:a63:9a12:: with SMTP id o18mr29582253pge.419.1634660775760; Tue, 19 Oct 2021 09:26:15 -0700 (PDT) Received: from localhost (220-142-196-159.dynamic-ip.hinet.net. [220.142.196.159]) by smtp.gmail.com with ESMTPSA id c21sm6945080pfv.145.2021.10.19.09.26.15 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 09:26:15 -0700 (PDT) From: You-Sheng Yang <vicamo.yang@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH 15/33][SRU][OEM-5.13] ath11k: fix survey dump collection in 6 GHz Date: Wed, 20 Oct 2021 00:25:30 +0800 Message-Id: <20211019162548.1408217-16-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.210.175; envelope-from=vicamo@gmail.com; helo=mail-pf1-f175.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 33b2b37c24db5..bcfb14dac6c58 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -6106,7 +6106,13 @@ static int ath11k_mac_op_get_survey(struct ieee80211_hw *hw, int idx, if (!sband) sband = hw->wiphy->bands[NL80211_BAND_5GHZ]; + if (sband && idx >= sband->n_channels) { + idx -= sband->n_channels; + sband = NULL; + } + if (!sband) + sband = hw->wiphy->bands[NL80211_BAND_6GHZ]; if (!sband || idx >= sband->n_channels) { ret = -ENOENT; goto exit;