From patchwork Thu Dec 5 06:26:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 11274223 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96E4B14BD for ; Thu, 5 Dec 2019 06:27:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F6752245C for ; Thu, 5 Dec 2019 06:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726175AbfLEG04 (ORCPT ); Thu, 5 Dec 2019 01:26:56 -0500 Received: from nbd.name ([46.4.11.11]:56166 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726128AbfLEG0z (ORCPT ); Thu, 5 Dec 2019 01:26:55 -0500 Received: from pd95fd3d5.dip0.t-ipconnect.de ([217.95.211.213] helo=bertha.datto.lan) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1ickbC-0001bo-Mw; Thu, 05 Dec 2019 07:26:50 +0100 From: John Crispin To: Kalle Valo Cc: ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, John Crispin Subject: [PATCH 1/2] ath11k: add some missing __packed qualifiers Date: Thu, 5 Dec 2019 07:26:44 +0100 Message-Id: <20191205062645.6033-1-john@phrozen.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org A few of the WMI parameter structs were missing this. Signed-off-by: John Crispin --- drivers/net/wireless/ath/ath11k/wmi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h index 0d7caa1e4d75..7a1ed73d8b7b 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -4562,12 +4562,12 @@ struct wmi_twt_enable_params_cmd { u32 mode_check_interval; u32 add_sta_slot_interval; u32 remove_sta_slot_interval; -}; +} __packed; struct wmi_twt_disable_params_cmd { u32 tlv_header; u32 pdev_id; -}; +} __packed; enum WMI_HOST_TWT_COMMAND { WMI_HOST_TWT_COMMAND_REQUEST_TWT = 0, @@ -4682,7 +4682,7 @@ struct wmi_obss_spatial_reuse_params_cmd { s32 obss_min; s32 obss_max; u32 vdev_id; -}; +} __packed; struct target_resource_config { u32 num_vdevs; From patchwork Thu Dec 5 06:26:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 11274221 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7658617EF for ; Thu, 5 Dec 2019 06:27:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54EDA224F8 for ; Thu, 5 Dec 2019 06:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726183AbfLEG04 (ORCPT ); Thu, 5 Dec 2019 01:26:56 -0500 Received: from nbd.name ([46.4.11.11]:56164 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725963AbfLEG0z (ORCPT ); Thu, 5 Dec 2019 01:26:55 -0500 Received: from pd95fd3d5.dip0.t-ipconnect.de ([217.95.211.213] helo=bertha.datto.lan) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1ickbD-0001bo-4S; Thu, 05 Dec 2019 07:26:51 +0100 From: John Crispin To: Kalle Valo Cc: ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, John Crispin Subject: [PATCH 2/2] ath11k: explicitly cast wmi commands to their correct struct type Date: Thu, 5 Dec 2019 07:26:45 +0100 Message-Id: <20191205062645.6033-2-john@phrozen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191205062645.6033-1-john@phrozen.org> References: <20191205062645.6033-1-john@phrozen.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Three of the WMI command handlers were not casting to the right data type. Lets make the code consistent with the other handlers. Signed-off-by: John Crispin --- drivers/net/wireless/ath/ath11k/wmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index a2f03360e19f..0c1064a0aa39 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -2517,7 +2517,7 @@ ath11k_wmi_send_twt_enable_cmd(struct ath11k *ar, u32 pdev_id) if (!skb) return -ENOMEM; - cmd = (void *)skb->data; + cmd = (struct wmi_twt_enable_params_cmd *)skb->data; cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_ENABLE_CMD) | FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); cmd->pdev_id = pdev_id; @@ -2568,7 +2568,7 @@ ath11k_wmi_send_twt_disable_cmd(struct ath11k *ar, u32 pdev_id) if (!skb) return -ENOMEM; - cmd = (void *)skb->data; + cmd = (struct wmi_twt_disable_params_cmd *)skb->data; cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_DISABLE_CMD) | FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); cmd->pdev_id = pdev_id; @@ -2768,7 +2768,7 @@ ath11k_wmi_send_obss_spr_cmd(struct ath11k *ar, u32 vdev_id, if (!skb) return -ENOMEM; - cmd = (void *)skb->data; + cmd = (struct wmi_obss_spatial_reuse_params_cmd *)skb->data; cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_OBSS_SPATIAL_REUSE_SET_CMD) | FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);