From patchwork Wed Sep 9 15:35:54 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: 249470 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp523450ilg; Wed, 9 Sep 2020 08:35:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaKAaGQWhC4Ojt1E7f5RjbMa8ysAhFn+3qOB+JYCA42+k0BCFbhdOwQpRRomosnq7/y5bw X-Received: by 2002:a92:9992:: with SMTP id t18mr4382331ilk.170.1599665715168; Wed, 09 Sep 2020 08:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599665715; cv=none; d=google.com; s=arc-20160816; b=XlLooi478bpEKWiSfJA9NDa/S4b4B9rfAPk+0se+GVmlUMubOTP+KCVbQzocxN2ruj hKJcgfjcovojar0kKD9S08+Uo4yQBozSkRTGRmZRSzNcWgmdv9IteJ6+HRxev+ZJBJcL tz2jc1R+jnbA36SbiiwvRFt/ijEsstTxX+jsLoYj5/iuJqYld0tyh3/IOPqIe2HSlxAt W9wc6aC1+yT0GWpNaW+sSZIa4AyFM/0OJPGd+3KqVW8ttn5Yv+JyzW/O1EhFoX83aaG/ UB4t3Shj56IbbstO9H/UQlPQbGeITmy+lGVaSdKrZbKbaMUR1jtL/foENEjD7TETWRXM MIxw== 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=WPX/raHK3PZn7zGmCoReNfg6IqomfvdKqSX2zIKfvE8=; b=g6m20+yp3c3xhrIFbQZgXkIuGmzJNYVyhKD8ciqcGl9kMN747lpVhUV0MG2QTc0bJL oQMGfz4fEgfKwB8gUL81A9VMCH78r0WuGedpwEqHHe+UtsaHxwXGh/HDEZBIOfekXScV gIUJvbbvJqXGRQvAfcjeKYlnWUzjMnO0TUGhMe+LN2wZSuvFsWjFbpYSpzuB5QSoN2a/ nxa8rL6KqZrE8xXc+Y2/6G3joigGRpN4ul4n4ktDQOkq+lT9407O3qqfgU4U8G8O+Ugh E+yZ39bzCtT5Y/rzGRGZaVJgscIzHfqy+hPPXvd6rtQi0LMa6pVCpHWlvw+amPZ/vraL MS7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=wIAT9+AN; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Xi/gaK17"; 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 k18si2259299ilk.39.2020.09.09.08.35.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:35:15 -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=wIAT9+AN; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Xi/gaK17"; 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=WPX/raHK3PZn7zGmCoReNfg6IqomfvdKqSX2zIKfvE8=; b=wIAT9+ANjXJ9HM23N3728bJsM pcyINxb59MS7cwz5W25HkkxdE/iGr3DSko8o18l1uHS4nYK7237A3d1Z7AISwGKNHJLhc4uYISod/ 8GEGQt72CmnoO7X8QlXdzmthTl1qTtxFQgDzVfFkY70QuP9av6KfxIt2BcdtPBtQxi6//So2USyeW kNWPlpVlIWfYa+NpLHsXcJqVtzkhaO4QSfacKaxH4NSgrCru3Xx6hiDrNd2E75r/lWixEAPXLQ2BE wbblGj4rZ2a4kZZK5DcPthDjnXSB5gwJBwIQfsiXTq7podLWBicqOX56HZIv8qbNKtWYZ/z7ntu97 y879dxKTA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG27r-0006I7-Qz; Wed, 09 Sep 2020 15:35:12 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG27p-0006Gx-4K for wcn36xx@lists.infradead.org; Wed, 09 Sep 2020 15:35:10 +0000 Received: by mail-wm1-x342.google.com with SMTP id k18so2809561wmj.5 for ; Wed, 09 Sep 2020 08:35:08 -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=tfNF9Nm72/GLHvVDln+H8GXexy5WDv58YkhHrtQxFnI=; b=Xi/gaK17S7A1P2TqeadY6OnuOBv2ko5+M3uMj9PoGSNOgZUW5DvaG0y24kHMGiqz7v +17c2FzRk0CUO6m5FYrb6K75lbtW+5wP+asoLHVbYg4lemsIBIgLiioQq+cb3NJ3E11V d1yxfZe/rHr9vjnh6QvufcfaUJI9P18H8Edac/FgaJ7sIg0P+6PrhWi2aW5I7VWeKHCe dU5kfU3U0wH1HWnikYLo45mk6D1O5VfH7cdWIlsuqKr0CsfXBb5AIiKo4UpzMISF2XfQ fWj8AbM+BycP6RTHPrxGSgX157+PtFIPbebOM9flbJeXtujxSZFG05ihSA0f1g3T5/Sl wF9w== 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=tfNF9Nm72/GLHvVDln+H8GXexy5WDv58YkhHrtQxFnI=; b=m21BFb1qth1pURPcZH0iaiJtxCAEepRRoP3Cfo+n2NyBbQ7jUFlsons4EcZp558lyk QR2lUfdk3WxO2q1ImfMwsr0FgD9g0Jjb8ohr53VDgAXq5zJ7/W5CZd31Yw8LmxRokPEz AB8Cjh7veh1wj9RiI+Jsf8mJQ6RTiRi/T8M42KxaPUAHQAFSnruMJx7OFVdJYt9VGqJU ydS5FmastbiM8DIGd5Qmx/b7/5mfYY6ktZEmsiVNK2Ays3AHN8pbZJBm4DguAbjh8b5N ac1RZEFZ35xKfNpwGXxJpAWiXHEQmPxiT1DWP7KwRT1N7A2PLvIUIfMaNRCyac+b+WXM bFUg== X-Gm-Message-State: AOAM530dvvce9/5srWiybotJzBOMwEnMDrYgazJDBrvjkoV6ZCuCBmBS dY5W7eptRnnLK8GIRgFDSjKT4EJV3CPIfQ== X-Received: by 2002:a1c:6385:: with SMTP id x127mr4298855wmb.95.1599665708121; Wed, 09 Sep 2020 08:35:08 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c4sm4922120wrp.85.2020.09.09.08.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:35:07 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH v4 2/2] wcn36xx: Use V1 data structure to store supported rates Date: Wed, 9 Sep 2020 16:35:54 +0100 Message-Id: <20200909153554.2904762-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909153554.2904762-1-bryan.odonoghue@linaro.org> References: <20200909153554.2904762-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-20200909_113509_210506_B5C36D3B X-CRM114-Status: GOOD ( 13.88 ) 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:342 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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 -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 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 55aaaeb78b14..d5ca9907af86 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];