Received-SPF: pass (google.com: domain of linux-wireless+bounces-588-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: David Lin <yu-hao.lin@nxp.com>
To: linux-wireless@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
	briannorris@chromium.org,
	kvalo@kernel.org,
	francesco@dolcini.it,
	tsung-hsien.hsieh@nxp.com,
	David Lin <yu-hao.lin@nxp.com>,
	stable@vger.kernel.org
Subject: [PATCH v2] wifi: mwifiex: fix STA cannot connect to AP
Date: Sat,  9 Dec 2023 07:41:27 +0800
Message-Id: <20231208234127.2251-1-yu-hao.lin@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?kB2g2G5InAK1ZFdZG5Xk4ARUuKNoxmMyfl2IGLGA9pFpqmHWhD4yH19xPOFh?=
 =?us-ascii?Q?qo5SFtxV3zwFuZ7198GHJJreiSHo+7xOmbDqdGtqEYngyjDxqX/R70s4J3Z7?=
 =?us-ascii?Q?qUUUH7O+asd++g9Yz365aZBHuldU9d1MS6jYOAsHojopmnDXU1+CCwV1gi6v?=
 =?us-ascii?Q?BTMhsYCChnDqRLytwcC2Rw0/SGx/wFsQ2pSK70o69q776+fqiEJu1XcSVFL5?=
 =?us-ascii?Q?98e0HrfcAzQPw0kzhFPYKAOgoO7HqEzrm8uiict4QRyBR5GXOpUhSgII5Vaa?=
 =?us-ascii?Q?BfdFQW8SAQpIQP4RgynNcWgr05cfJ40IxlV7ULVpPQCR8E5Zz31Vp0uj2KaN?=
 =?us-ascii?Q?AeZj1daZKHnp/6XVs1Dwu2kQMh2CnubiMuLYGzc/ZCcDdRGtEROQklGfhEBE?=
 =?us-ascii?Q?09kmTSZK5chxxI3G3ShKXPXDTwdiD2yf6z9bPsXIRpwCEJaxZ1KmNFhjkotq?=
 =?us-ascii?Q?2QhDCuFbzW+VQofwbQ6S3cIf8xe3ymyzm2Cq+jB0PpsrpIXF8GyRYu+OuinX?=
 =?us-ascii?Q?qFGeRwrKBk0qU6pgCznoy/PZectIxS5KrRS++5odDBK0FPnnUigQz+Fxtnvn?=
 =?us-ascii?Q?wf9nDAZxLqRsFX99IW+7d3O9mRuqi+zoKErKyqwLrT03P2J8RA9s5qrb/aAK?=
 =?us-ascii?Q?npTE/3sSaemCFTJv5wTseh2UzlX4hM0osgdcsEJ+IMBDyT1Auf9kPzOLUNmu?=
 =?us-ascii?Q?Uma53bayyv1N9gZFr0ymAFr7ntGJqKx8qL01C8Zbl2k8n7rsH9UE+NO9LcAb?=
 =?us-ascii?Q?3CnJcRcyfU+TgC5d9DAcbnqQQhDNdfazNyTc/+kJKqB2rTR2kjBOLbUpR8JI?=
 =?us-ascii?Q?CuEDZsBdOqv/C0Cz6JA5UhIKSUhrXnkK6cEl2wx/JVJEr8lptC7h3T49jE6f?=
 =?us-ascii?Q?rvMOF5M2yJTzTV83qrGzmuRUSOQMMC4Uwq7WEvcEBQFW0FN16nka1sS7WLxu?=
 =?us-ascii?Q?GCRTE4Vv2Kl/OCdSxAW5bE8fqxeAKTivaasp2cjAHvfJUxt9iCK3NOM7cE6Z?=
 =?us-ascii?Q?KE7cWLnpdVhYcQc7ip0lUpfO5Ki5pJHBK2dFm22EjPrAb9Kdi80jpyJOYSyz?=
 =?us-ascii?Q?hGawlM4igiCyikPV+mZE/AJ8oEOZ6+s6/lTE4zO1Axa9XN1kXfmngpaw6Eej?=
 =?us-ascii?Q?YCGLgDgoFfyOVNIFUN8S/SH3lYLcw3U5lupr9V+otCvS6bPdRg2CANODSbCo?=
 =?us-ascii?Q?GbDINFMA2X2FB1Co93qGCRNc1pXa/gQ+PDn6iuTpCx1zR/OZXHd3dyEjgn/k?=
 =?us-ascii?Q?lphVUpz8bvXPL/ot1+QD1wfTMF7Lofw/AnbkhBQhxYoTNrdg4bR0MNHo/eOc?=
 =?us-ascii?Q?EBMmX0+FG+G5inpwpo+2wp+N0T3jFzzjy7sIX7gpCLREjx3zplGyXy/8w1ba?=
 =?us-ascii?Q?9jSdI0zq0oJVtT+Mioi9t/BkK8phMmvawbZU4VnZHn1S0YU3V2/f6DuzVd3n?=
 =?us-ascii?Q?wNeRE88GwGqf7VBSsGFHmctwyNMF7VYg4JM+CvcohelncebbmZk60W0gdS20?=
 =?us-ascii?Q?fzeVDTcCTtiCp9czG7cpU/Q+pwvDa952K3V7DShCtTXiBw77r6MFmqubSAWN?=
 =?us-ascii?Q?QVibYGNoTCzGazqSoQ5rW/bx80rEOBZ+ggC2CybH2CTGPwOKz+Ul3DVLzui6?=
 =?us-ascii?Q?pw1DWJY5Po6iaA7xJfJc1t7DQbJoUoTDmo0PGD30fhjp?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 347b1a54-6ab4-4f9c-a2ca-08dbf8473e6d
X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB9638.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2023 23:41:47.7967
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: myaOMbwfqxqgVR1S7hw1mBwYdlY9zAc+c+K6T9KtSh4N1fvCy/4wie06AP6UdVfr+P4WnkMAz7EHJY0PRgzeUQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9110

AP BSSID configuration is missing at AP start.
Without this fix, FW returns STA interface MAC address after first init.
When hostapd restarts, it gets MAC address from netdev before driver
sets STA MAC to netdev again. Now MAC address between hostapd and net
interface are different causes STA cannot connect to AP.
After that MAC address of uap0 mlan0 become the same. And issue
disappears after following hostapd restart (another issue is AP/STA MAC
address become the same).
This patch fixes the issue cleanly.

Signed-off-by: David Lin <yu-hao.lin@nxp.com>
Fixes: 12190c5d80bd ("mwifiex: add cfg80211 start_ap and stop_ap handlers")
Cc: stable@vger.kernel.org

---

v2:
   - v1 was a not finished patch that was send to the LKML by mistake
---
 drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 ++
 drivers/net/wireless/marvell/mwifiex/fw.h       | 1 +
 drivers/net/wireless/marvell/mwifiex/ioctl.h    | 1 +
 drivers/net/wireless/marvell/mwifiex/uap_cmd.c  | 8 ++++++++
 4 files changed, 12 insertions(+)

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 7a15ea8072e6..3604abcbcff9 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -2047,6 +2047,8 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
 
 	mwifiex_set_sys_config_invalid_data(bss_cfg);
 
+	memcpy(bss_cfg->mac_addr, priv->curr_addr, ETH_ALEN);
+
 	if (params->beacon_interval)
 		bss_cfg->beacon_period = params->beacon_interval;
 	if (params->dtim_period)
diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index 8e6db904e5b2..62f3c9a52a1d 100644
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -165,6 +165,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define TLV_TYPE_STA_MAC_ADDR       (PROPRIETARY_TLV_BASE_ID + 32)
 #define TLV_TYPE_BSSID              (PROPRIETARY_TLV_BASE_ID + 35)
 #define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)
+#define TLV_TYPE_UAP_MAC_ADDRESS    (PROPRIETARY_TLV_BASE_ID + 43)
 #define TLV_TYPE_UAP_BEACON_PERIOD  (PROPRIETARY_TLV_BASE_ID + 44)
 #define TLV_TYPE_UAP_DTIM_PERIOD    (PROPRIETARY_TLV_BASE_ID + 45)
 #define TLV_TYPE_UAP_BCAST_SSID     (PROPRIETARY_TLV_BASE_ID + 48)
diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h
index 091e7ca79376..e8825f302de8 100644
--- a/drivers/net/wireless/marvell/mwifiex/ioctl.h
+++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h
@@ -107,6 +107,7 @@ struct mwifiex_uap_bss_param {
 	u8 qos_info;
 	u8 power_constraint;
 	struct mwifiex_types_wmm_info wmm_info;
+	u8 mac_addr[ETH_ALEN];
 };
 
 enum {
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
index e78a201cd150..491e36611909 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
@@ -468,6 +468,7 @@ void mwifiex_config_uap_11d(struct mwifiex_private *priv,
 static int
 mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
 {
+	struct host_cmd_tlv_mac_addr *mac_tlv;
 	struct host_cmd_tlv_dtim_period *dtim_period;
 	struct host_cmd_tlv_beacon_period *beacon_period;
 	struct host_cmd_tlv_ssid *ssid;
@@ -487,6 +488,13 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
 	int i;
 	u16 cmd_size = *param_size;
 
+	mac_tlv = (struct host_cmd_tlv_mac_addr *)tlv;
+	mac_tlv->header.type = cpu_to_le16(TLV_TYPE_UAP_MAC_ADDRESS);
+	mac_tlv->header.len = cpu_to_le16(ETH_ALEN);
+	memcpy(mac_tlv->mac_addr, bss_cfg->mac_addr, ETH_ALEN);
+	cmd_size += sizeof(struct host_cmd_tlv_mac_addr);
+	tlv += sizeof(struct host_cmd_tlv_mac_addr);
+
 	if (bss_cfg->ssid.ssid_len) {
 		ssid = (struct host_cmd_tlv_ssid *)tlv;
 		ssid->header.type = cpu_to_le16(TLV_TYPE_UAP_SSID);

base-commit: 783004b6dbda2cfe9a552a4cc9c1d168a2068f6c
-- 
2.25.1