[nrf noup] zephyr: Fix AP de-authentication and disassociation

fixup! [nrf noup] ap: Add support for basic open connection

nRF70 doesn't implement AP SME, so, any SME frames have to generated by
hostapd/wpa_supplicant itself. Previously FMAC API's were used for
de-authentication and disassociation but that won't work.

Switch to generating those frames in the wpa_supplicant itself and use
MLME FMAC API to send them out.

Fixes SHEL-2393.

Signed-off-by: Chaitanya Tata <[email protected]>

src/drivers/driver_zephyr.c

@@ -23,6 +23,10 @@
 #define SCAN_TIMEOUT 35
 #define GET_WIPHY_TIMEOUT 10
 
+int wpa_drv_zep_send_mlme(void *priv, const u8 *data, size_t data_len, int noack,
+	unsigned int freq, const u16 *csa_offs, size_t csa_offs_len, int no_encrypt,
+	unsigned int wait);
+
 void wpa_supplicant_event_wrapper(void *ctx,
 				enum wpa_event_type event,
 				union wpa_event_data *data)
@@ -1682,25 +1686,30 @@ int wpa_drv_zep_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr, u16 r
 	struct zep_drv_if_ctx *if_ctx = priv;
 	const struct zep_wpa_supp_dev_ops *dev_ops;
 	int ret = -1;
+	struct ieee80211_mgmt mgmt;
 
 	if ((!priv) || (!addr)) {
 		wpa_printf(MSG_ERROR, "%s: Invalid params\n", __func__);
 		goto out;
 	}
 
 	dev_ops = if_ctx->dev_ctx->config;
-	if (!dev_ops->sta_deauth) {
-		wpa_printf(MSG_ERROR, "%s: sta_deauth op not supported\n",
-			   __func__);
-		goto out;
-	}
-
-	ret = dev_ops->sta_deauth(if_ctx->dev_priv, own_addr, addr, reason_code);
-	if (ret) {
-		wpa_printf(MSG_ERROR, "%s: sta_deauth op failed: %d\n", __func__, ret);
-		goto out;
-	}
 
+	wpa_printf(MSG_DEBUG, "%s: addr %p reason_code %d\n",
+		   __func__, addr, reason_code);
+
+	memset(&mgmt, 0, sizeof(mgmt));
+	mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
+					  WLAN_FC_STYPE_DEAUTH);
+	memcpy(mgmt.da, addr, ETH_ALEN);
+	memcpy(mgmt.sa, own_addr, ETH_ALEN);
+	memcpy(mgmt.bssid, own_addr, ETH_ALEN);
+	mgmt.u.deauth.reason_code = host_to_le16(reason_code);
+
+	return wpa_drv_zep_send_mlme(priv, (u8 *) &mgmt,
+					    IEEE80211_HDRLEN +
+					    sizeof(mgmt.u.deauth), 0, if_ctx->freq, 0, 0,
+					    0, 0);
 out:
 	return ret;
 }
@@ -1710,25 +1719,30 @@ int wpa_drv_zep_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr, u16
 	struct zep_drv_if_ctx *if_ctx = priv;
 	const struct zep_wpa_supp_dev_ops *dev_ops;
 	int ret = -1;
+	struct ieee80211_mgmt mgmt;
 
 	if ((!priv) || (!addr)) {
 		wpa_printf(MSG_ERROR, "%s: Invalid params\n", __func__);
 		goto out;
 	}
 
 	dev_ops = if_ctx->dev_ctx->config;
-	if (!dev_ops->sta_disassoc) {
-		wpa_printf(MSG_ERROR, "%s: sta_disassoc op not supported\n",
-			   __func__);
-		goto out;
-	}
-
-	ret = dev_ops->sta_disassoc(if_ctx->dev_priv, own_addr, addr, reason_code);
-	if (ret) {
-		wpa_printf(MSG_ERROR, "%s: sta_disassoc op failed: %d\n", __func__, ret);
-		goto out;
-	}
 
+	wpa_printf(MSG_DEBUG, "%s: addr %p reason_code %d\n",
+		   __func__, addr, reason_code);
+
+	memset(&mgmt, 0, sizeof(mgmt));
+	mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
+					  WLAN_FC_STYPE_DISASSOC);
+	memcpy(mgmt.da, addr, ETH_ALEN);
+	memcpy(mgmt.sa, own_addr, ETH_ALEN);
+	memcpy(mgmt.bssid, own_addr, ETH_ALEN);
+	mgmt.u.disassoc.reason_code = host_to_le16(reason_code);
+
+	return wpa_drv_zep_send_mlme(priv, (u8 *) &mgmt,
+					    IEEE80211_HDRLEN +
+					    sizeof(mgmt.u.disassoc), 0, if_ctx->freq, 0, 0,
+					    0, 0);
 out:
 	return ret;
 }

src/drivers/driver_zephyr.h

@@ -248,12 +248,6 @@ struct zep_wpa_supp_dev_ops {
 
 	int (*sta_clear_stats)(void *if_priv, const u8 *addr);
 
-	int (*sta_deauth)(void *if_priv, const u8 *own_addr, const u8 *addr,
-			int reason_code);
-
-	int (*sta_disassoc)(void *if_priv, const u8 *own_addr, const u8 *addr,
-			int reason_code);
-
 	int (*register_mgmt_frame)(void *if_priv, u16 frame_type,
 			size_t match_len, const u8 *match);
 };