From patchwork Sat Aug 29 03:38:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 248675 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp1602506ilg; Fri, 28 Aug 2020 20:38:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwB29Ou9TEyoR433iwxlpP8woEINgNSEdZcMnhJwOrM9T0p75o0FzJdnI5ioJIXuZSqq2aI X-Received: by 2002:a6b:b98a:: with SMTP id j132mr1451181iof.67.1598672309918; Fri, 28 Aug 2020 20:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598672309; cv=none; d=google.com; s=arc-20160816; b=UbqiMcbfVrUPn//yplcpA28FSIv1GEcyiFFUEFcwsrUur50CwHq94hEKlDgZ8W6a/4 YyCn8SFgVdP9rsJZ0ALeFcYVFfKIhGclCv9TASeDcSADIa1x4zESThOEXZtkUVF3YPoC DoOL7oMmF8Q3RcJRxK+Yia0hvcbaLReTXr5kx9ZQnGRZSHR1+EqLCQOKkLd2T6mKjMW7 B+KJMqAhe+X4R3cUYohFcUbgZ206nywDHeHlaaE0DXYp8vOoB1krvMcrFz5Zw6DUN9G1 JD1AelZptSZFc8iwPH3KALenAJx8KFQvod+M0hl6jtssi9Bk/9NRv4z1A9ZKZDYR8HfW 3Fxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:dkim-signature; bh=+NpXKR11w2XDfEUcNQcuYlcAPEs0gg6GbLGp1kpbq9E=; b=fCIAxNICGt58xZmPvSRw/9RGDJSzz/ZECNjtlEhHoctPqUdYmxxCeEyiZlnK69x5UO 5hQ8V5bq6PUN+/D8CGTDIcw5AQhFQRwPNRGNWcNvPSb3aLXlpJhFas3s2HfnvEMC+oRv idnC0zSmRA7slPMchpUyqPd69NzekrzOg/pZYJBYNgdLr3W0dHpJj9Lrl+C7obpEyx2D gvXnLtZRlLMmbyo/BG52dbguRwNDA/mnYRelMnO4qE41o2Q2lpDEh/AHKZ+PF805d8Zw a4hSWYFQ9gc8RNKYy9AZs8a7Lz8UiJX3NmlfWj5vFtJvElF9fdXE5aoPcs/f9ocYh3aj 97Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=GB2iDFQw; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=I2ght7KY; spf=pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) smtp.mailfrom="wcn36xx-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from merlin.infradead.org (merlin.infradead.org. [2001:8b0:10b:1231::1]) by mx.google.com with ESMTPS id w17si1036814jad.33.2020.08.28.20.38.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 20:38:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) client-ip=2001:8b0:10b:1231::1; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=GB2iDFQw; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=I2ght7KY; spf=pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) smtp.mailfrom="wcn36xx-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+NpXKR11w2XDfEUcNQcuYlcAPEs0gg6GbLGp1kpbq9E=; b=GB2iDFQwvtxjIP4GXz6a0tGZa U1mWDAIkwAoqSeoioXzBmZNG1/xwgtQUrBXauzH9XDdaWtDWkr+KY/xNwnObbEO7RQ5KV22WYXG+t QVFz2GkSvzX6Ulp/Ypgd1to9oL75RhY7dwWxildsES0c6TK1XzG/QGCCUY0YUmpBhciDNEdqIut1s F4JLYpqIA1Lu1cXxV1ShXXp4gQSY1yLHOfvD8qBSR4pkcFhjzFRf79UKteAHsh9EJW8OuW/L1kdcQ NLtVUphkOSJ5LNFU/oLmWZa3JxSUdd6jJ11MDLByRQ8q2oXi2ENSPAkRTvUdQA4JyX/vIKsIlHNZV AlSgcLVFA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBrhC-0002GO-V1; Sat, 29 Aug 2020 03:38:26 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBrhB-0002F9-8P for wcn36xx@lists.infradead.org; Sat, 29 Aug 2020 03:38:26 +0000 Received: by mail-wr1-x444.google.com with SMTP id x7so890571wro.3 for ; Fri, 28 Aug 2020 20:38:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VWQ4Mgj5nJFptUvhPYJTMNqJmysjiQoavD7tKrDaEsk=; b=I2ght7KYE/B5nH2d5bhSaDOCKvd0k1yBR5ZhLE/yT9OApX7QSRPgs0E+vJjKJEvRQ1 zRoM6Sah/TVJaU0BsCI02iIEipZ3Koj3JQdREkIirjjNY6B1mePBDQDwMhTjJOVmlq2h INg01W10mTrQolzhIy4Cd2MG8Z6Bc8lsxbYnX8h3JhzVMuaZJaN7jqfQB1TX5OzlVs96 DnT6Rg1O6721xBAbeyh72wDZww9UwDK2nWOhAQwyNWXn2YXTuG4mZ1II/8e5Cvz32VCZ iKUNXLKSmyEdN7XEhHboVcwjG1PwBaAEHer6ksDhxQc6x0c+Dpb9UDtxEqrJn8AEjTDC oyhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VWQ4Mgj5nJFptUvhPYJTMNqJmysjiQoavD7tKrDaEsk=; b=HN1tWGz28GshAAvzO6oorCzTRXYWPCGysR7pi1CocyubutexFRvlMMAZ9xYpibFw6s i0pFUVuH6cWCVqAzm+Z6ZOuk1te8Xhg3yJC3P9z8CYA8NQblIhlYuO3fr0y368RAMYRK yqdXt1Lm+P3zpM3gewRDCNhQFO3nxCuioq6SaUAY/GHBXb/QQMKeE4bEpiNtvH5rHXPx F/Lx2d65BhMT2o50OacrUDCg9QXSyRRZUH0Vt/mzHl6iSNNDYI6bBedE33B5kcJgRmuG g3mH6+i3WtENxfK+sDZutiMfjQM/w8jWxpoxEFsehs8srXs+FuoKha4McAsd7hWTl/1G qTJg== X-Gm-Message-State: AOAM531lkfkw6eG+K8aYknftVJ5jtqq4AZ4PwsiFjDCfM3K0ryZMZyzq izeghPD7M1TCWkzC4yKOqBmuueVtkSCEKmxj X-Received: by 2002:a5d:540c:: with SMTP id g12mr1687315wrv.120.1598672304240; Fri, 28 Aug 2020 20:38:24 -0700 (PDT) Received: from localhost.localdomain ([176.61.57.127]) by smtp.gmail.com with ESMTPSA id t9sm1649179wmj.47.2020.08.28.20.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 20:38:23 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH v2 02/12] wcn36xx: Use V1 data structure to store supported rates Date: Sat, 29 Aug 2020 04:38:58 +0100 Message-Id: <20200829033908.2167689-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200829033908.2167689-1-bryan.odonoghue@linaro.org> References: <20200829033908.2167689-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200828_233825_334093_4234AE08 X-CRM114-Status: GOOD ( 14.73 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: wcn36xx@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bryan.odonoghue@linaro.org, shawn.guo@linaro.org, loic.poulain@linaro.org Sender: "wcn36xx" Errors-To: wcn36xx-bounces+patch=linaro.org@lists.infradead.org This patch converts the internal data structure used to store data-rates from version 0 to version 1. This allows us to extend out the internal storage to represent VHT parameters. Using the extended version 1 data-structure allows us to avoid a whole raft of version 1 specific fixup functions. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/smd.c | 5 +++-- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.27.0 _______________________________________________ wcn36xx mailing list wcn36xx@lists.infradead.org http://lists.infradead.org/mailman/listinfo/wcn36xx diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 4c30036e2e56..8534d36c3ae0 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -242,9 +242,10 @@ static void wcn36xx_smd_set_sta_params(struct wcn36xx *wcn, sta_params->aid = sta_priv->aid; wcn36xx_smd_set_sta_ht_params(sta, sta_params); memcpy(&sta_params->supported_rates, &sta_priv->supported_rates, - sizeof(sta_priv->supported_rates)); + sizeof(struct wcn36xx_hal_supported_rates)); } else { - wcn36xx_set_default_rates(&sta_params->supported_rates); + wcn36xx_set_default_rates((struct wcn36xx_hal_supported_rates *) + &sta_params->supported_rates); wcn36xx_smd_set_sta_default_ht_params(sta_params); } } diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index 342ca0ae7e28..d7d349de20e6 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -169,7 +169,7 @@ struct wcn36xx_sta { u8 bss_dpu_desc_index; bool is_data_encrypted; /* Rates */ - struct wcn36xx_hal_supported_rates supported_rates; + struct wcn36xx_hal_supported_rates_v1 supported_rates; spinlock_t ampdu_lock; /* protects next two fields */ enum wcn36xx_ampdu_state ampdu_state[16];