samples: common: make net_connect() a noop with NET_CONFIG_NEED_IPV4

In case of CONFIG_NET_CONFIG_NEED_IPV4=y Zephyr networking subsystem initialization code already takes care about configuring IP layer and making sure there is assigned IPv4 address before reaching 'main()' function. Make net_connect() a noop in that case, as no more networking setup is needed. Signed-off-by: Marcin Niestroj <[email protected]>
golioth · Oct 12, 2023 · 976421a · 976421a
1 parent 25f9752
commit 976421a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/samples/common/CMakeLists.txt b/samples/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-zephyr_library_sources(net_connect.c)
+zephyr_library_sources_ifndef(CONFIG_NET_CONFIG_NEED_IPV4 net_connect.c)
 zephyr_library_sources_ifdef(CONFIG_GOLIOTH_SAMPLE_HARDCODED_CREDENTIALS hardcoded_credentials.c)
 zephyr_library_sources_ifdef(CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR nrf91_lte_monitor.c)
 zephyr_library_sources_ifdef(CONFIG_GOLIOTH_SAMPLE_PSK_SETTINGS settings_golioth.c)

diff --git a/samples/common/include/samples/common/net_connect.h b/samples/common/include/samples/common/net_connect.h
@@ -13,7 +13,11 @@
  * @{
  */
 
+#ifdef CONFIG_NET_CONFIG_NEED_IPV4
+static inline void net_connect(void) {}
+#else
 void net_connect(void);
+#endif
 
 /** @} */