| Message ID | 20200910150822.2179261-2-bryan.odonoghue@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f97fe43a949502e9c47183c5aafcd49e2e74e448 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wcn36xx: Enable VHT when supported | expand |
Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote: > In order to pass 802.11ac VHT parameters from the SoC to wcn36xx we need to > use the V1 data structures associated with BSS and STA parameters. > > The means of identifying a V1 data-structure is via the SMD version field. > This patch defines a INIT_HAL_MSG_V1() which operates the same way as > INIT_HAL_MSG() with the exception that it defines VERSION1 as opposed to > VERSION0. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> 4 patches applied to ath-next branch of ath.git, thanks. f97fe43a9495 wcn36xx: Define INIT_HAL_MSG_V1() d961fdfaa208 wcn36xx: Convert to VHT parameter structure on wcn3680 87d3f1f34157 wcn36xx: Add VHT rates to wcn36xx_update_allowed_rates() b421d04e4978 wcn36xx: Advertise ieee802.11 VHT flags
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index dde43a2b0d81..0f5952003fff 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -466,14 +466,20 @@ static void init_hal_msg(struct wcn36xx_hal_msg_header *hdr, hdr->len = msg_size + sizeof(*hdr); } -#define INIT_HAL_MSG(msg_body, type) \ +#define __INIT_HAL_MSG(msg_body, type, version) \ do { \ memset(&msg_body, 0, sizeof(msg_body)); \ msg_body.header.msg_type = type; \ - msg_body.header.msg_version = WCN36XX_HAL_MSG_VERSION0; \ + msg_body.header.msg_version = version; \ msg_body.header.len = sizeof(msg_body); \ } while (0) \ +#define INIT_HAL_MSG(msg_body, type) \ + __INIT_HAL_MSG(msg_body, type, WCN36XX_HAL_MSG_VERSION0) + +#define INIT_HAL_MSG_V1(msg_body, type) \ + __INIT_HAL_MSG(msg_body, type, WCN36XX_HAL_MSG_VERSION1) + #define INIT_HAL_PTT_MSG(p_msg_body, ppt_msg_len) \ do { \ memset(p_msg_body, 0, sizeof(*p_msg_body) + ppt_msg_len); \
In order to pass 802.11ac VHT parameters from the SoC to wcn36xx we need to use the V1 data structures associated with BSS and STA parameters. The means of identifying a V1 data-structure is via the SMD version field. This patch defines a INIT_HAL_MSG_V1() which operates the same way as INIT_HAL_MSG() with the exception that it defines VERSION1 as opposed to VERSION0. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- drivers/net/wireless/ath/wcn36xx/smd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)