net: Fix build issues with arm-clang

The arm-clang compiler/linker does not optimize away unused function symbols and thus will error if symbols that are referenced are not defined. To fix this add needed ifdef'ry. Build various network samples that utilize ethernet but don't have CONFIG_NET_PROMISCUOUS_MODE will get a link error for: Error: L6218E: Undefined symbol net_mgmt_NET_REQUEST_ETHERNET_SET_PROMISC_MODE (referred from ethernet.o). Fix by adding ifdef protection around promisc code. Signed-off-by: Kumar Gala <[email protected]>
finikorg · Apr 25, 2023 · 0090ad7 · 0090ad7
1 parent a01d40f
commit 0090ad7
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
@@ -2348,14 +2348,30 @@ void net_if_add_tx_timestamp(struct net_pkt *pkt);
  *
  * @return 0 on success, <0 if error
  */
+#if defined(CONFIG_NET_PROMISCUOUS_MODE)
 int net_if_set_promisc(struct net_if *iface);
+#else
+static inline int net_if_set_promisc(struct net_if *iface)
+{
+	ARG_UNUSED(iface);
+
+	return -ENOTSUP;
+}
+#endif
 
 /**
  * @brief Set network interface into normal mode
  *
  * @param iface Pointer to network interface
  */
+#if defined(CONFIG_NET_PROMISCUOUS_MODE)
 void net_if_unset_promisc(struct net_if *iface);
+#else
+static inline void net_if_unset_promisc(struct net_if *iface)
+{
+	ARG_UNUSED(iface);
+}
+#endif
 
 /**
  * @brief Check if promiscuous mode is set or not.
@@ -2365,7 +2381,16 @@ void net_if_unset_promisc(struct net_if *iface);
  * @return True if interface is in promisc mode,
  *         False if interface is not in in promiscuous mode.
  */
+#if defined(CONFIG_NET_PROMISCUOUS_MODE)
 bool net_if_is_promisc(struct net_if *iface);
+#else
+static inline bool net_if_is_promisc(struct net_if *iface)
+{
+	ARG_UNUSED(iface);
+
+	return false;
+}
+#endif
 
 /**
  * @brief Check if there are any pending TX network data for a given network

diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
@@ -4316,6 +4316,7 @@ void net_if_dormant_off(struct net_if *iface)
 	k_mutex_unlock(&lock);
 }
 
+#if defined(CONFIG_NET_PROMISCUOUS_MODE)
 static int promisc_mode_set(struct net_if *iface, bool enable)
 {
 	enum net_l2_flags l2_flags = 0;
@@ -4390,6 +4391,7 @@ bool net_if_is_promisc(struct net_if *iface)
 
 	return net_if_flag_is_set(iface, NET_IF_PROMISC);
 }
+#endif /* CONFIG_NET_PROMISCUOUS_MODE */
 
 #ifdef CONFIG_NET_POWER_MANAGEMENT
 

diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
@@ -1178,6 +1178,7 @@ void net_eth_set_ptp_port(struct net_if *iface, int port)
 }
 #endif /* CONFIG_NET_L2_PTP */
 
+#if defined(CONFIG_NET_PROMISCUOUS_MODE)
 int net_eth_promisc_mode(struct net_if *iface, bool enable)
 {
 	struct ethernet_req_params params;
@@ -1191,6 +1192,7 @@ int net_eth_promisc_mode(struct net_if *iface, bool enable)
 	return net_mgmt(NET_REQUEST_ETHERNET_SET_PROMISC_MODE, iface,
 			&params, sizeof(struct ethernet_req_params));
 }
+#endif/* CONFIG_NET_PROMISCUOUS_MODE */
 
 void ethernet_init(struct net_if *iface)
 {

diff --git a/tests/net/iface/prj.conf b/tests/net/iface/prj.conf
@@ -8,6 +8,7 @@ CONFIG_NET_MAX_CONTEXTS=4
 CONFIG_NET_L2_DUMMY=y
 CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_L2_ETHERNET_MGMT=y
+CONFIG_NET_PROMISCUOUS_MODE=y
 CONFIG_NET_LOG=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y