Revert "[nrf fromlist] drivers: wifi: nrf_wifi: Add per-peer authorized flag"

This reverts commit f39dddd.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit dec54af)

Author: krish2718

drivers/wifi/nrf_wifi/inc/fmac_main.h

@@ -75,6 +75,9 @@ struct nrf_wifi_vif_ctx_zep {
 #endif /* CONFIG_NET_STATISTICS_ETHERNET_VENDOR */
 	struct net_stats_eth eth_stats;
 #endif /* CONFIG_NET_STATISTICS_ETHERNET */
+#if defined(CONFIG_NRF70_STA_MODE) || defined(CONFIG_NRF70_RAW_DATA_RX)
+	bool authorized;
+#endif
 #ifdef CONFIG_NRF70_STA_MODE
 	unsigned int assoc_freq;
 	enum nrf_wifi_fmac_if_carr_state if_carr_state;

drivers/wifi/nrf_wifi/src/net_if.c

@@ -25,7 +25,6 @@ LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
 #include "util.h"
 #include "common/fmac_util.h"
-#include "system/fmac_peer.h"
 #include "shim.h"
 #include "fmac_main.h"
 #include "wpa_supp_if.h"
@@ -389,8 +388,6 @@ int nrf_wifi_if_send(const struct device *dev,
 	struct rpu_host_stats *host_stats = NULL;
 	void *nbuf = NULL;
 	bool locked = false;
-	unsigned char *ra = NULL;
-	int peer_id = -1;
 
 	if (!dev || !pkt) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
@@ -439,20 +436,12 @@ int nrf_wifi_if_send(const struct device *dev,
 						      nbuf);
 	} else {
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
-
-		ra = nrf_wifi_util_get_ra(sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx], nbuf);
-		peer_id = nrf_wifi_fmac_peer_get_id(rpu_ctx_zep->rpu_ctx, ra);
-		if (peer_id == -1) {
-			nrf_wifi_osal_log_dbg("%s: Invalid peer",
-				      __func__);
-			goto out;
-		}
-
 		if ((vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) ||
-		    (!sys_dev_ctx->tx_config.peers[peer_id].authorized && !is_eapol(pkt))) {
+		    (!vif_ctx_zep->authorized && !is_eapol(pkt))) {
 			ret = -EPERM;
 			goto drop;
 		}
+
 		ret = nrf_wifi_fmac_start_xmit(rpu_ctx_zep->rpu_ctx,
 					       vif_ctx_zep->vif_idx,
 					       nbuf);

drivers/wifi/nrf_wifi/src/wifi_mgmt.c

@@ -18,7 +18,6 @@
 #include "system/fmac_api.h"
 #include "system/fmac_tx.h"
 #include "common/fmac_util.h"
-#include "common/fmac_structs_common.h"
 #include "fmac_main.h"
 #include "wifi_mgmt.h"
 
@@ -758,8 +757,6 @@ int nrf_wifi_mode(const struct device *dev,
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
 	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
-	struct peers_info *peer = NULL;
-	int i = 0;
 	int ret = -1;
 
 	if (!dev || !mode) {
@@ -801,16 +798,10 @@ int nrf_wifi_mode(const struct device *dev,
 			goto out;
 		}
 
-		for (i = 0; i < MAX_PEERS; i++) {
-			peer = &sys_dev_ctx->tx_config.peers[i];
-			if (peer->peer_id == -1) {
-				continue;
-			}
-			if (peer->authorized && (mode->mode == NRF_WIFI_MONITOR_MODE)) {
-				LOG_ERR("%s: Cannot set monitor mode when station is connected",
-					__func__);
-					goto out;
-			}
+		if (vif_ctx_zep->authorized && (mode->mode == NRF_WIFI_MONITOR_MODE)) {
+			LOG_ERR("%s: Cannot set monitor mode when station is connected",
+				__func__);
+			goto out;
 		}
 
 		/**
@@ -860,8 +851,6 @@ int nrf_wifi_channel(const struct device *dev,
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct peers_info *peer = NULL;
-	int i = 0;
 	int ret = -1;
 
 	if (!dev || !channel) {
@@ -875,16 +864,9 @@ int nrf_wifi_channel(const struct device *dev,
 		return ret;
 	}
 
-	for (i = 0; i < MAX_PEERS; i++) {
-		peer = &sys_dev_ctx->tx_config.peers[i];
-		if (peer->peer_id == -1) {
-			continue;
-		}
-		if (peer->authorized) {
-			LOG_ERR("%s: Cannot change channel when in station connected mode",
-				__func__);
-			return ret;
-		}
+	if (vif_ctx_zep->authorized) {
+		LOG_ERR("%s: Cannot change channel when in station connected mode", __func__);
+		return ret;
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;

drivers/wifi/nrf_wifi/src/wpa_supp_if.c

@@ -17,7 +17,6 @@
 #include "common/fmac_util.h"
 #include "wifi_mgmt.h"
 #include "wpa_supp_if.h"
-#include <system/fmac_peer.h>
 
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
@@ -1108,9 +1107,7 @@ int nrf_wifi_wpa_set_supp_port(void *if_priv, int authorized, char *bssid)
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_umac_chg_sta_info chg_sta_info;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
-	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	int peer_id = -1;
 	int ret = -1;
 
 	if (!if_priv || !bssid) {
@@ -1141,6 +1138,8 @@ int nrf_wifi_wpa_set_supp_port(void *if_priv, int authorized, char *bssid)
 
 	memcpy(chg_sta_info.mac_addr, bssid, ETH_ALEN);
 
+	vif_ctx_zep->authorized = authorized;
+
 	if (authorized) {
 		/* BIT(NL80211_STA_FLAG_AUTHORIZED) */
 		chg_sta_info.sta_flags2.nrf_wifi_mask = 1 << 1;
@@ -1158,19 +1157,6 @@ int nrf_wifi_wpa_set_supp_port(void *if_priv, int authorized, char *bssid)
 		goto out;
 	}
 
-	sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
-
-	peer_id = nrf_wifi_fmac_peer_get_id(rpu_ctx_zep->rpu_ctx, chg_sta_info.mac_addr);
-	if (peer_id == -1) {
-		nrf_wifi_osal_log_err("%s: Invalid peer",
-				      __func__);
-		goto out;
-	}
-
-	if (chg_sta_info.sta_flags2.nrf_wifi_set & NRF_WIFI_STA_FLAG_AUTHORIZED) {
-		sys_dev_ctx->tx_config.peers[peer_id].authorized = true;
-	}
-
 	ret = 0;
 out:
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
@@ -3003,9 +2989,7 @@ int nrf_wifi_wpa_supp_sta_set_flags(void *if_priv, const u8 *addr,
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_umac_chg_sta_info chg_sta = {0};
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
-	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	int peer_id = -1;
 	int ret = -1;
 
 	if (!if_priv || !addr) {
@@ -3040,19 +3024,6 @@ int nrf_wifi_wpa_supp_sta_set_flags(void *if_priv, const u8 *addr,
 		goto out;
 	}
 
-	sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
-
-	peer_id = nrf_wifi_fmac_peer_get_id(rpu_ctx_zep->rpu_ctx, chg_sta.mac_addr);
-	if (peer_id == -1) {
-		nrf_wifi_osal_log_err("%s: Invalid peer",
-				      __func__);
-		goto out;
-	}
-
-	if (chg_sta.sta_flags2.nrf_wifi_set & NRF_WIFI_STA_FLAG_AUTHORIZED) {
-		sys_dev_ctx->tx_config.peers[peer_id].authorized = true;
-	}
-
 	ret = 0;
 
 out: