Pull GARP TX support

drivers/ethernet/Kconfig

@@ -5,11 +5,21 @@
 
 menuconfig ETH_DRIVER
 	bool "Ethernet drivers"
-	default y
-	depends on NET_L2_ETHERNET
+	depends on NETWORKING
+	depends on !NET_TEST
+	default y if NET_L2_ETHERNET
 
 if ETH_DRIVER
 
+config ETH_DRIVER_RAW_MODE
+	bool "Ethernet driver without the MAC stack"
+	select NET_RAW_MODE
+	depends on !NET_L2_ETHERNET
+	help
+	  This option enables using the drivers in a so-called "raw" mode,
+	  i.e. without a MAC stack (the net L2 layer for ethernet will not
+	  be built).
+
 module = ETHERNET
 module-dep = LOG
 module-str = Log level for Ethernet driver
@@ -71,7 +81,7 @@ endif # "Ethernet Drivers"
 config ETH_INIT_PRIORITY
 	int "Ethernet driver init priority"
 	default 80
-	depends on NET_L2_ETHERNET
+	depends on NET_L2_ETHERNET || ETH_DRIVER
 	help
 	  Ethernet device driver initialization priority.
 	  Do not mess with it unless you know what you are doing.

drivers/ethernet/phy/Kconfig

@@ -3,8 +3,11 @@
 # Copyright (c) 2021 IP-Logix Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-menu "Ethernet PHY Drivers"
-	depends on NET_L2_ETHERNET
+menuconfig ETH_PHY_DRIVER
+	bool "Ethernet PHY drivers"
+	default y if NET_L2_ETHERNET || ETH_DRIVER
+
+if ETH_PHY_DRIVER
 
 module = PHY
 module-dep = LOG
@@ -54,4 +57,4 @@ config PHY_MONITOR_PERIOD
 	  periodically executed to detect and report any changes in the
 	  PHY link status to the operating system.
 
-endmenu # "Ethernet PHY Drivers"
+endif # "Ethernet PHY Drivers"

drivers/modem/hl7800.c

@@ -2105,7 +2105,9 @@ static bool on_cmd_atcmdinfo_ipaddr(struct net_buf **buf, uint16_t len)
 				LOG_ERR("Cannot set iface IPv4 addr");
 			}
 
-			net_if_ipv4_set_netmask(iface_ctx.iface, &iface_ctx.subnet);
+			net_if_ipv4_set_netmask_by_addr(iface_ctx.iface,
+							&new_ipv4_addr,
+							&iface_ctx.subnet);
 			net_if_ipv4_set_gw(iface_ctx.iface, &iface_ctx.gateway);
 #endif
 			/* store the new IP addr */

drivers/net/Kconfig

@@ -156,7 +156,6 @@ config SLIP_STATISTICS
 config SLIP_TAP
 	bool "Use TAP interface to host"
 	default y
-	select NET_L2_ETHERNET
 	help
 	  In TAP the Ethernet frames are transferred over SLIP.
 

drivers/net/loopback.c

@@ -50,7 +50,7 @@ static void loopback_init(struct net_if *iface)
 			LOG_ERR("Failed to register IPv4 loopback address");
 		}
 
-		net_if_ipv4_set_netmask(iface, &netmask);
+		net_if_ipv4_set_netmask_by_addr(iface, &ipv4_loopback, &netmask);
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IPV6)) {

drivers/wifi/esp_at/esp.c

@@ -443,7 +443,9 @@ static void esp_mgmt_disconnect_work(struct k_work *work)
 	esp_flags_clear(dev, EDF_STA_CONNECTED);
 	esp_mode_switch_submit_if_needed(dev);
 
+#if defined(CONFIG_NET_NATIVE_IPV4)
 	net_if_ipv4_addr_rm(dev->net_iface, &dev->ip);
+#endif
 	net_if_dormant_on(dev->net_iface);
 	wifi_mgmt_raise_disconnect_result_event(dev->net_iface, 0);
 }
@@ -509,14 +511,16 @@ static void esp_ip_addr_work(struct k_work *work)
 		return;
 	}
 
+#if defined(CONFIG_NET_NATIVE_IPV4)
 	/* update interface addresses */
-	net_if_ipv4_set_gw(dev->net_iface, &dev->gw);
-	net_if_ipv4_set_netmask(dev->net_iface, &dev->nm);
 #if defined(CONFIG_WIFI_ESP_AT_IP_STATIC)
 	net_if_ipv4_addr_add(dev->net_iface, &dev->ip, NET_ADDR_MANUAL, 0);
 #else
 	net_if_ipv4_addr_add(dev->net_iface, &dev->ip, NET_ADDR_DHCP, 0);
 #endif
+	net_if_ipv4_set_gw(dev->net_iface, &dev->gw);
+	net_if_ipv4_set_netmask_by_addr(dev->net_iface, &dev->ip, &dev->nm);
+#endif
 
 	if (IS_ENABLED(CONFIG_WIFI_ESP_AT_DNS_USE)) {
 		ret = esp_cmd_send(dev, dns_cmds, ARRAY_SIZE(dns_cmds),
@@ -761,7 +765,9 @@ MODEM_CMD_DEFINE(on_cmd_ready)
 	dev->flags = 0;
 	dev->mode = 0;
 
+#if defined(CONFIG_NET_NATIVE_IPV4)
 	net_if_ipv4_addr_rm(dev->net_iface, &dev->ip);
+#endif
 	k_work_submit_to_queue(&dev->workq, &dev->init_work);
 
 	return 0;

drivers/wifi/eswifi/eswifi_core.c

@@ -676,8 +676,8 @@ static int eswifi_mgmt_ap_enable(const struct device *dev,
 
 	/* Set IP Address */
 	for (i = 0; ipv4 && i < NET_IF_MAX_IPV4_ADDR; i++) {
-		if (ipv4->unicast[i].is_used) {
-			unicast = &ipv4->unicast[i];
+		if (ipv4->unicast[i].ipv4.is_used) {
+			unicast = &ipv4->unicast[i].ipv4;
 			break;
 		}
 	}

include/zephyr/net/ethernet.h

@@ -592,17 +592,6 @@ struct ethernet_context {
 	 */
 	atomic_t flags;
 
-#if defined(CONFIG_NET_VLAN)
-	struct ethernet_vlan vlan[NET_VLAN_MAX_COUNT];
-
-	/** Array that will help when checking if VLAN is enabled for
-	 * some specific network interface. Requires that VLAN count
-	 * NET_VLAN_MAX_COUNT is not smaller than the actual number
-	 * of network interfaces.
-	 */
-	ATOMIC_DEFINE(interfaces, NET_VLAN_MAX_COUNT);
-#endif
-
 #if defined(CONFIG_NET_ETHERNET_BRIDGE)
 	struct eth_bridge_iface_context bridge;
 #endif
@@ -651,14 +640,6 @@ struct ethernet_context {
 	dsa_send_t dsa_send;
 #endif
 
-#if defined(CONFIG_NET_VLAN)
-	/** Flag that tells whether how many VLAN tags are enabled for this
-	 * context. The same information can be dug from the vlan array but
-	 * this saves some time in RX path.
-	 */
-	int8_t vlan_enabled;
-#endif
-
 	/** Is network carrier up */
 	bool is_net_carrier_up : 1;
 
@@ -839,6 +820,9 @@ int net_eth_vlan_enable(struct net_if *iface, uint16_t tag);
 #else
 static inline int net_eth_vlan_enable(struct net_if *iface, uint16_t tag)
 {
+	ARG_UNUSED(iface);
+	ARG_UNUSED(tag);
+
 	return -EINVAL;
 }
 #endif
@@ -856,14 +840,20 @@ int net_eth_vlan_disable(struct net_if *iface, uint16_t tag);
 #else
 static inline int net_eth_vlan_disable(struct net_if *iface, uint16_t tag)
 {
+	ARG_UNUSED(iface);
+	ARG_UNUSED(tag);
+
 	return -EINVAL;
 }
 #endif
 
 /**
- * @brief Return VLAN tag specified to network interface
+ * @brief Return VLAN tag specified to network interface.
  *
- * @param iface Network interface.
+ * Note that the interface parameter must be the VLAN interface,
+ * and not the Ethernet one.
+ *
+ * @param iface VLAN network interface.
  *
  * @return VLAN tag for this interface or NET_VLAN_TAG_UNSPEC if VLAN
  * is not configured for that interface.
@@ -873,15 +863,16 @@ uint16_t net_eth_get_vlan_tag(struct net_if *iface);
 #else
 static inline uint16_t net_eth_get_vlan_tag(struct net_if *iface)
 {
+	ARG_UNUSED(iface);
+
 	return NET_VLAN_TAG_UNSPEC;
 }
 #endif
 
 /**
  * @brief Return network interface related to this VLAN tag
  *
- * @param iface Master network interface. This is used to get the
- *        pointer to ethernet L2 context
+ * @param iface Main network interface (not the VLAN one).
  * @param tag VLAN tag
  *
  * @return Network interface related to this tag or NULL if no such interface
@@ -893,17 +884,46 @@ struct net_if *net_eth_get_vlan_iface(struct net_if *iface, uint16_t tag);
 static inline
 struct net_if *net_eth_get_vlan_iface(struct net_if *iface, uint16_t tag)
 {
+	ARG_UNUSED(iface);
+	ARG_UNUSED(tag);
+
+	return NULL;
+}
+#endif
+
+/**
+ * @brief Return main network interface that is attached to this VLAN tag.
+ *
+ * @param iface VLAN network interface. This is used to get the
+ *        pointer to ethernet L2 context
+ *
+ * @return Network interface related to this tag or NULL if no such interface
+ * exists.
+ */
+#if defined(CONFIG_NET_VLAN)
+struct net_if *net_eth_get_vlan_main(struct net_if *iface);
+#else
+static inline
+struct net_if *net_eth_get_vlan_main(struct net_if *iface)
+{
+	ARG_UNUSED(iface);
+
 	return NULL;
 }
 #endif
 
 /**
- * @brief Check if VLAN is enabled for a specific network interface.
+ * @brief Check if there are any VLAN interfaces enabled to this specific
+ *        Ethernet network interface.
+ *
+ * Note that the iface must be the actual Ethernet interface and not the
+ * virtual VLAN interface.
  *
  * @param ctx Ethernet context
- * @param iface Network interface
+ * @param iface Ethernet network interface
  *
- * @return True if VLAN is enabled for this network interface, false if not.
+ * @return True if there are enabled VLANs for this network interface,
+ *         false if not.
  */
 #if defined(CONFIG_NET_VLAN)
 bool net_eth_is_vlan_enabled(struct ethernet_context *ctx,
@@ -912,6 +932,9 @@ bool net_eth_is_vlan_enabled(struct ethernet_context *ctx,
 static inline bool net_eth_is_vlan_enabled(struct ethernet_context *ctx,
 					   struct net_if *iface)
 {
+	ARG_UNUSED(ctx);
+	ARG_UNUSED(iface);
+
 	return false;
 }
 #endif
@@ -928,28 +951,57 @@ bool net_eth_get_vlan_status(struct net_if *iface);
 #else
 static inline bool net_eth_get_vlan_status(struct net_if *iface)
 {
+	ARG_UNUSED(iface);
+
 	return false;
 }
 #endif
 
+/**
+ * @brief Check if the given interface is a VLAN interface.
+ *
+ * @param iface Network interface
+ *
+ * @return True if this network interface is VLAN one, false if not.
+ */
 #if defined(CONFIG_NET_VLAN)
-#define Z_ETH_NET_DEVICE_INIT(node_id, dev_id, name, init_fn, pm, data,	\
-			      config, prio, api, mtu)			\
+bool net_eth_is_vlan_interface(struct net_if *iface);
+#else
+static inline bool net_eth_is_vlan_interface(struct net_if *iface)
+{
+	ARG_UNUSED(iface);
+
+	return false;
+}
+#endif
+
+#if !defined(CONFIG_ETH_DRIVER_RAW_MODE)
+
+#define Z_ETH_NET_DEVICE_INIT_INSTANCE(node_id, dev_id, name, instance,	\
+				       init_fn, pm, data, config, prio,	\
+				       api, mtu)			\
+	Z_NET_DEVICE_INIT_INSTANCE(node_id, dev_id, name, instance,	\
+				   init_fn, pm, data, config, prio,	\
+				   api, ETHERNET_L2,			\
+				   NET_L2_GET_CTX_TYPE(ETHERNET_L2), mtu)
+
+#else /* CONFIG_ETH_DRIVER_RAW_MODE */
+
+#define Z_ETH_NET_DEVICE_INIT_INSTANCE(node_id, dev_id, name, instance,	\
+				       init_fn, pm, data, config, prio,	\
+				       api, mtu)			\
 	Z_DEVICE_STATE_DEFINE(dev_id);					\
 	Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn, pm, data,	\
 			config, POST_KERNEL, prio, api,			\
-			&Z_DEVICE_STATE_NAME(dev_id));			\
-	NET_L2_DATA_INIT(dev_id, 0, NET_L2_GET_CTX_TYPE(ETHERNET_L2));	\
-	NET_IF_INIT(dev_id, 0, ETHERNET_L2, mtu, NET_VLAN_MAX_COUNT)
+			&Z_DEVICE_STATE_NAME(dev_id));
 
-#else /* CONFIG_NET_VLAN */
+#endif /* CONFIG_ETH_DRIVER_RAW_MODE */
 
 #define Z_ETH_NET_DEVICE_INIT(node_id, dev_id, name, init_fn, pm, data,	\
 			      config, prio, api, mtu)			\
-	Z_NET_DEVICE_INIT(node_id, dev_id, name, init_fn, pm, data,	\
-			  config, prio, api, ETHERNET_L2,		\
-			  NET_L2_GET_CTX_TYPE(ETHERNET_L2), mtu)
-#endif /* CONFIG_NET_VLAN */
+	Z_ETH_NET_DEVICE_INIT_INSTANCE(node_id, dev_id, name, 0,	\
+				       init_fn, pm, data, config, prio,	\
+				       api, mtu)
 
 /**
  * @brief Create an Ethernet network interface and bind it to network device.
@@ -973,6 +1025,34 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
 	Z_ETH_NET_DEVICE_INIT(DT_INVALID_NODE, dev_id, name, init_fn,	\
 			      pm, data, config, prio, api, mtu)
 
+/**
+ * @brief Create multiple Ethernet network interfaces and bind them to network
+ * devices.
+ * If your network device needs more than one instance of a network interface,
+ * use this macro below and provide a different instance suffix each time
+ * (0, 1, 2, ... or a, b, c ... whatever works for you)
+ *
+ * @param dev_id Network device id.
+ * @param name The name this instance of the driver exposes to
+ * the system.
+ * @param instance Instance identifier.
+ * @param init_fn Address to the init function of the driver.
+ * @param pm Reference to struct pm_device associated with the device.
+ * (optional).
+ * @param data Pointer to the device's private data.
+ * @param config The address to the structure containing the
+ * configuration information for this instance of the driver.
+ * @param prio The initialization level at which configuration occurs.
+ * @param api Provides an initial pointer to the API function struct
+ * used by the driver. Can be NULL.
+ * @param mtu Maximum transfer unit in bytes for this network interface.
+ */
+#define ETH_NET_DEVICE_INIT_INSTANCE(dev_id, name, instance, init_fn,	\
+				     pm, data, config, prio, api, mtu)	\
+	Z_ETH_NET_DEVICE_INIT_INSTANCE(DT_INVALID_NODE, dev_id, name,	\
+				       instance, init_fn, pm, data,	\
+				       config, prio, api, mtu)
+
 /**
  * @brief Like ETH_NET_DEVICE_INIT but taking metadata from a devicetree.
  * Create an Ethernet network interface and bind it to network device.

include/zephyr/net/net_context.h

@@ -331,6 +331,9 @@ __net_socket struct net_context {
 #endif
 #if defined(CONFIG_NET_IPV4_MAPPING_TO_IPV6)
 		bool ipv6_v6only;
+#endif
+#if defined(CONFIG_NET_CONTEXT_RECV_PKTINFO)
+		bool recv_pktinfo;
 #endif
 	} options;
 
@@ -1102,6 +1105,7 @@ enum net_context_option {
 	NET_OPT_REUSEADDR	= 9,
 	NET_OPT_REUSEPORT	= 10,
 	NET_OPT_IPV6_V6ONLY	= 11,
+	NET_OPT_RECV_PKTINFO    = 12,
 };
 
 /**