[PATCH v7 12/12] wifi: mwifiex: fixed compile and coding errors.

David Lin posted 12 patches 2 years ago
[PATCH v7 12/12] wifi: mwifiex: fixed compile and coding errors.
Posted by David Lin 2 years ago
1. struct cfg80211_rx_assoc_resp -> struct cfg80211_rx_assoc_resp_data.
2. Pointer should be used for memcpy.

Signed-off-by: David Lin <yu-hao.lin@nxp.com>
---
 drivers/net/wireless/marvell/mwifiex/cmdevt.c  | 2 +-
 drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 85429c51c407..63246cdfed65 100644
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -928,7 +928,7 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)
 
 void mwifiex_process_assoc_resp(struct mwifiex_adapter *adapter)
 {
-	struct cfg80211_rx_assoc_resp assoc_resp = {
+	struct cfg80211_rx_assoc_resp_data assoc_resp = {
 		.uapsd_queues = -1,
 	};
 	struct mwifiex_private *priv =
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
index e393cc78bb98..1ed3ba6aaefe 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
@@ -910,7 +910,7 @@ static int mwifiex_cmd_uap_add_station(struct mwifiex_private *priv,
 		tlv->header.type = cpu_to_le16(WLAN_EID_OPMODE_NOTIF);
 		tlv_len = sizeof(u8);
 		tlv->header.len = cpu_to_le16(tlv_len);
-		memcpy(tlv->data, params->link_sta_params.opmode_notif,
+		memcpy(tlv->data, &params->link_sta_params.opmode_notif,
 		       tlv_len);
 		pos += (header_len + tlv_len);
 		cmd->size += (header_len + tlv_len);
-- 
2.25.1
Re: [PATCH v7 12/12] wifi: mwifiex: fixed compile and coding errors.
Posted by Francesco Dolcini 2 years ago
On Tue, Nov 28, 2023 at 04:31:15PM +0800, David Lin wrote:
> 1. struct cfg80211_rx_assoc_resp -> struct cfg80211_rx_assoc_resp_data.
> 2. Pointer should be used for memcpy.

this is changing code that you just add on this series, no separate
patch.

Francesco