net: wifi: add P2P iface type and shell command routing

Introduce WIFI_TYPE_P2P to the wifi_nm_iface_type enum and register
a corresponding net_if_get_wifi_p2p() lookup function. All P2P shell
commands are updated to use IFACE_TYPE_P2P instead of IFACE_TYPE_STA,
with automatic fallback to the STA interface when no dedicated P2P
interface is registered.

Fix the supplicant context default-interface selection in
add_interface(): use == 1 instead of > 0 so that the first
registered interface (STA) is captured as ctx->iface rather than
being overwritten by subsequent UAP/P2P registrations.

All new symbols are guarded by CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P.

Signed-off-by: Hui Bai <hui.bai@nxp.com>

Author: nxf58150

include/zephyr/net/net_if.h

@@ -3410,6 +3410,18 @@ struct net_if *net_if_get_wifi_sta(void);
  */
 struct net_if *net_if_get_wifi_sap(void);
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P
+/**
+ * @brief Get Wi-Fi P2P (Wi-Fi Direct) network interface.
+ *
+ * Returns the iface registered as WIFI_TYPE_P2P, or falls back to
+ * the STA iface for drivers that run P2P on the STA interface.
+ *
+ * @return Pointer to network interface, NULL if not found.
+ */
+struct net_if *net_if_get_wifi_p2p(void);
+#endif
+
 /**
  * @brief Get network interface name.
  *

include/zephyr/net/wifi_nm.h

@@ -38,6 +38,10 @@ enum wifi_nm_iface_type {
 	WIFI_TYPE_STA = 0,
 	/** IEEE 802.11 Wi-Fi Soft AP */
 	WIFI_TYPE_SAP,
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P
+	/** IEEE 802.11 Wi-Fi P2P (Wi-Fi Direct) */
+	WIFI_TYPE_P2P,
+#endif
 };
 
 /**
@@ -119,6 +123,18 @@ bool wifi_nm_iface_is_sta(struct net_if *iface);
  */
 bool wifi_nm_iface_is_sap(struct net_if *iface);
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P
+/**
+ * @brief Check if the interface is a Wi-Fi P2P (Wi-Fi Direct) interface
+ *
+ * @param iface Interface
+ *
+ * @retval true If the interface is a Wi-Fi P2P interface.
+ *
+ */
+bool wifi_nm_iface_is_p2p(struct net_if *iface);
+#endif
+
 /**
  * @brief Register a managed interface
  *

modules/hostap/src/supp_main.c

@@ -378,7 +378,7 @@ static int add_interface(struct supplicant_context *ctx, struct net_if *iface)
 	wpa_s->conf->ap_scan = 1;
 
 	/* Default interface, kick start supplicant */
-	if (get_iface_count(ctx) > 0) {
+	if (get_iface_count(ctx) == 1) {
 		ctx->iface = iface;
 		net_if_get_name(iface, ctx->if_name, CONFIG_NET_INTERFACE_NAME_LEN);
 	}

subsys/net/ip/net_if.c

@@ -6670,6 +6670,26 @@ struct net_if *net_if_get_wifi_sap(void)
 	return net_if_get_first_wifi();
 }
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P
+struct net_if *net_if_get_wifi_p2p(void)
+{
+	STRUCT_SECTION_FOREACH(net_if, iface) {
+		if (net_if_is_wifi(iface)
+#ifdef CONFIG_WIFI_NM
+		    && wifi_nm_iface_is_p2p(iface)
+#endif
+		) {
+			return iface;
+		}
+	}
+
+	/* No dedicated P2P iface registered.
+	 * Return the first WiFi interface.
+	 */
+	return net_if_get_first_wifi();
+}
+#endif
+
 int net_if_get_name(struct net_if *iface, char *buf, int len)
 {
 #if defined(CONFIG_NET_INTERFACE_NAME)

subsys/net/l2/wifi/wifi_nm.c

@@ -74,6 +74,13 @@ bool wifi_nm_iface_is_sap(struct net_if *iface)
 	return wifi_nm_get_type_iface(iface) & BIT(WIFI_TYPE_SAP);
 }
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P
+bool wifi_nm_iface_is_p2p(struct net_if *iface)
+{
+	return wifi_nm_get_type_iface(iface) & BIT(WIFI_TYPE_P2P);
+}
+#endif
+
 int wifi_nm_register_mgd_iface(struct wifi_nm_instance *nm, struct net_if *iface)
 {
 	if (!nm || !iface) {

subsys/net/l2/wifi/wifi_shell.c

@@ -108,6 +108,7 @@ static struct wifi_ap_sta_node sta_list[CONFIG_WIFI_SHELL_MAX_AP_STA];
 enum iface_type {
 	IFACE_TYPE_STA,
 	IFACE_TYPE_SAP,
+	IFACE_TYPE_P2P,
 };
 
 static struct net_if *get_iface(enum iface_type type, int argc, char *argv[])
@@ -148,10 +149,21 @@ static struct net_if *get_iface(enum iface_type type, int argc, char *argv[])
 		} else if (type == IFACE_TYPE_SAP) {
 			iface = net_if_get_wifi_sap();
 		}
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P
+		else if (type == IFACE_TYPE_P2P) {
+			iface = net_if_get_wifi_p2p();
+		}
+#endif
 
 		if (iface == NULL) {
 			LOG_ERR("No default interface found for type: %s",
-					type == IFACE_TYPE_STA ? "STA" : "SAP");
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P
+				type == IFACE_TYPE_STA ? "STA" :
+				type == IFACE_TYPE_SAP ? "SAP" : "P2P"
+#else
+				type == IFACE_TYPE_STA ? "STA" : "SAP"
+#endif
+			       );
 			return NULL;
 		}
 	}
@@ -3937,7 +3949,7 @@ static void print_peer_info(const struct shell *sh, int index,
 
 static int cmd_wifi_p2p_peer(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = get_iface(IFACE_TYPE_STA, argc, argv);
+	struct net_if *iface = get_iface(IFACE_TYPE_P2P, argc, argv);
 	struct wifi_p2p_params params = {0};
 	uint8_t mac_addr[WIFI_MAC_ADDR_LEN];
 	static struct wifi_p2p_device_info peers[WIFI_P2P_MAX_PEERS];
@@ -3992,7 +4004,7 @@ static int cmd_wifi_p2p_peer(const struct shell *sh, size_t argc, char *argv[])
 
 static int cmd_wifi_p2p_find(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = get_iface(IFACE_TYPE_STA, argc, argv);
+	struct net_if *iface = get_iface(IFACE_TYPE_P2P, argc, argv);
 	struct wifi_p2p_params params = {0};
 
 	context.sh = sh;
@@ -4065,7 +4077,7 @@ static int cmd_wifi_p2p_find(const struct shell *sh, size_t argc, char *argv[])
 
 static int cmd_wifi_p2p_stop_find(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = get_iface(IFACE_TYPE_STA, argc, argv);
+	struct net_if *iface = get_iface(IFACE_TYPE_P2P, argc, argv);
 	struct wifi_p2p_params params = {0};
 
 	context.sh = sh;
@@ -4082,7 +4094,7 @@ static int cmd_wifi_p2p_stop_find(const struct shell *sh, size_t argc, char *arg
 
 static int cmd_wifi_p2p_connect(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = get_iface(IFACE_TYPE_STA, argc, argv);
+	struct net_if *iface = get_iface(IFACE_TYPE_P2P, argc, argv);
 	struct wifi_p2p_params params = {0};
 	uint8_t mac_addr[WIFI_MAC_ADDR_LEN];
 	const char *method_arg = NULL;
@@ -4188,7 +4200,7 @@ static int cmd_wifi_p2p_connect(const struct shell *sh, size_t argc, char *argv[
 
 static int cmd_wifi_p2p_group_add(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = get_iface(IFACE_TYPE_STA, argc, argv);
+	struct net_if *iface = get_iface(IFACE_TYPE_P2P, argc, argv);
 	struct wifi_p2p_params params = {0};
 	int opt;
 	int opt_index = 0;
@@ -4280,7 +4292,7 @@ static int cmd_wifi_p2p_group_add(const struct shell *sh, size_t argc, char *arg
 
 static int cmd_wifi_p2p_group_remove(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = get_iface(IFACE_TYPE_STA, argc, argv);
+	struct net_if *iface = get_iface(IFACE_TYPE_P2P, argc, argv);
 	struct wifi_p2p_params params = {0};
 
 	context.sh = sh;
@@ -4305,7 +4317,7 @@ static int cmd_wifi_p2p_group_remove(const struct shell *sh, size_t argc, char *
 
 static int cmd_wifi_p2p_invite(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = get_iface(IFACE_TYPE_STA, argc, argv);
+	struct net_if *iface = get_iface(IFACE_TYPE_P2P, argc, argv);
 	struct wifi_p2p_params params = {0};
 	uint8_t mac_addr[WIFI_MAC_ADDR_LEN];
 	int opt;
@@ -4438,7 +4450,7 @@ static int cmd_wifi_p2p_invite(const struct shell *sh, size_t argc, char *argv[]
 
 static int cmd_wifi_p2p_power_save(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = get_iface(IFACE_TYPE_STA, argc, argv);
+	struct net_if *iface = get_iface(IFACE_TYPE_P2P, argc, argv);
 	struct wifi_p2p_params params = {0};
 	bool power_save_enable = false;