net: l2: Move the layer 2 code into subsys/net/

The subsys/net/ directory is more logical place for L2 code instead of ip/ directory. No functionality changes by this commit. Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
zephyrproject-rtos · Jun 27, 2018 · 8ae6bad · 8ae6bad
1 parent 099fe7b
commit 8ae6bad
Show file tree

Hide file tree

Showing 41 changed files with 14 additions and 13 deletions.
diff --git a/drivers/ethernet/CMakeLists.txt b/drivers/ethernet/CMakeLists.txt
@@ -1,4 +1,4 @@
-zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/net/ip/l2)
+zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/net/l2)
 
 zephyr_sources_ifdef(CONFIG_ETH_SAM_GMAC
 	eth_sam_gmac.c

diff --git a/subsys/net/CMakeLists.txt b/subsys/net/CMakeLists.txt
@@ -3,6 +3,8 @@ zephyr_library_sources_ifdef(CONFIG_NET_BUF             buf.c)
 zephyr_library_sources_ifdef(CONFIG_NET_HOSTNAME_ENABLE hostname.c)
 
 if(CONFIG_NETWORKING)
+  add_subdirectory(l2)
+
   if(CONFIG_NET_RAW_MODE)
     zephyr_library_sources(ip/net_pkt.c)
   else()

diff --git a/subsys/net/Kconfig b/subsys/net/Kconfig
@@ -93,6 +93,8 @@ if NETWORKING
 
 source "subsys/net/Kconfig.hostname"
 
+source "subsys/net/l2/Kconfig"
+
 source "subsys/net/ip/Kconfig"
 
 source "subsys/net/lib/Kconfig"

diff --git a/subsys/net/ip/CMakeLists.txt b/subsys/net/ip/CMakeLists.txt
@@ -28,8 +28,6 @@ zephyr_library_sources_ifdef(CONFIG_NET_TCP          connection.c tcp.c)
 zephyr_library_sources_ifdef(CONFIG_NET_TRICKLE      trickle.c)
 zephyr_library_sources_ifdef(CONFIG_NET_UDP          connection.c udp.c)
 
-add_subdirectory(l2)
-
 if(CONFIG_NET_SHELL)
 zephyr_link_interface_ifdef(CONFIG_MBEDTLS mbedTLS)
 zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)

diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
@@ -439,8 +439,6 @@ config NET_PKT_TIMESTAMP_STACK_SIZE
 
 source "subsys/net/ip/Kconfig.stack"
 
-source "subsys/net/ip/l2/Kconfig"
-
 source "subsys/net/ip/Kconfig.mgmt"
 
 source "subsys/net/ip/Kconfig.rpl"

diff --git a/subsys/net/ip/l2/CMakeLists.txt → subsys/net/l2/CMakeLists.txt b/subsys/net/ip/l2/CMakeLists.txt → subsys/net/l2/CMakeLists.txt
@@ -4,7 +4,7 @@ if(CONFIG_NET_L2_BT OR
     CONFIG_NET_L2_WIFI_MGMT)
 
   zephyr_library()
-  zephyr_library_include_directories(. ..)
+  zephyr_library_include_directories(. ${ZEPHYR_BASE}/subsys/net/ip)
   zephyr_library_compile_definitions_ifdef(
     CONFIG_NEWLIB_LIBC __LINUX_ERRNO_EXTENSIONS__
     )

diff --git a/subsys/net/ip/l2/Kconfig → subsys/net/l2/Kconfig b/subsys/net/ip/l2/Kconfig → subsys/net/l2/Kconfig
@@ -91,11 +91,11 @@ config NET_L2_BT_SHELL
 	  This can be used for testing Bluetooth management commands through the
 	  console via a shell module named "net_bt".
 
-source "subsys/net/ip/l2/ethernet/Kconfig"
+source "subsys/net/l2/ethernet/Kconfig"
 
-source "subsys/net/ip/l2/ieee802154/Kconfig"
+source "subsys/net/l2/ieee802154/Kconfig"
 
-source "subsys/net/ip/l2/openthread/Kconfig"
+source "subsys/net/l2/openthread/Kconfig"
 
 config NET_L2_WIFI_MGMT
 	bool "Enable WiFi Management support"

diff --git a/subsys/net/ip/l2/bluetooth.c → subsys/net/l2/bluetooth.c b/subsys/net/ip/l2/bluetooth.c → subsys/net/l2/bluetooth.c
diff --git a/subsys/net/ip/l2/bluetooth_shell.c → subsys/net/l2/bluetooth_shell.c b/subsys/net/ip/l2/bluetooth_shell.c → subsys/net/l2/bluetooth_shell.c
diff --git a/subsys/net/ip/l2/dummy.c → subsys/net/l2/dummy.c b/subsys/net/ip/l2/dummy.c → subsys/net/l2/dummy.c
diff --git a/subsys/net/ip/l2/ethernet/CMakeLists.txt → subsys/net/l2/ethernet/CMakeLists.txt b/subsys/net/ip/l2/ethernet/CMakeLists.txt → subsys/net/l2/ethernet/CMakeLists.txt
@@ -1,5 +1,5 @@
 zephyr_library()
-zephyr_library_include_directories(. ../..)
+zephyr_library_include_directories(. ${ZEPHYR_BASE}/subsys/net/ip)
 zephyr_library_compile_definitions_ifdef(
   CONFIG_NEWLIB_LIBC __LINUX_ERRNO_EXTENSIONS__
   )

diff --git a/subsys/net/ip/l2/ethernet/Kconfig → subsys/net/l2/ethernet/Kconfig b/subsys/net/ip/l2/ethernet/Kconfig → subsys/net/l2/ethernet/Kconfig
diff --git a/subsys/net/ip/l2/ethernet/arp.c → subsys/net/l2/ethernet/arp.c b/subsys/net/ip/l2/ethernet/arp.c → subsys/net/l2/ethernet/arp.c
diff --git a/subsys/net/ip/l2/ethernet/eth_stats.h → subsys/net/l2/ethernet/eth_stats.h b/subsys/net/ip/l2/ethernet/eth_stats.h → subsys/net/l2/ethernet/eth_stats.h
diff --git a/subsys/net/ip/l2/ethernet/ethernet.c → subsys/net/l2/ethernet/ethernet.c b/subsys/net/ip/l2/ethernet/ethernet.c → subsys/net/l2/ethernet/ethernet.c
diff --git a/subsys/net/ip/l2/ethernet/ethernet_mgmt.c → subsys/net/l2/ethernet/ethernet_mgmt.c b/subsys/net/ip/l2/ethernet/ethernet_mgmt.c → subsys/net/l2/ethernet/ethernet_mgmt.c
diff --git a/subsys/net/ip/l2/ethernet/ethernet_stats.c → subsys/net/l2/ethernet/ethernet_stats.c b/subsys/net/ip/l2/ethernet/ethernet_stats.c → subsys/net/l2/ethernet/ethernet_stats.c
diff --git a/subsys/net/ip/l2/ieee802154/CMakeLists.txt → subsys/net/l2/ieee802154/CMakeLists.txt b/subsys/net/ip/l2/ieee802154/CMakeLists.txt → subsys/net/l2/ieee802154/CMakeLists.txt
@@ -1,5 +1,5 @@
 zephyr_library()
-zephyr_library_include_directories(. ../..)
+zephyr_library_include_directories(. ${ZEPHYR_BASE}/subsys/net/ip)
 zephyr_library_compile_definitions_ifdef(
   CONFIG_NEWLIB_LIBC __LINUX_ERRNO_EXTENSIONS__
   )

diff --git a/subsys/net/ip/l2/ieee802154/Kconfig → subsys/net/l2/ieee802154/Kconfig b/subsys/net/ip/l2/ieee802154/Kconfig → subsys/net/l2/ieee802154/Kconfig
@@ -150,6 +150,6 @@ config NET_L2_IEEE802154_SECURITY_CRYPTO_DEV_NAME
 	  IEEE 802.15.4 soft MAC will use to run authentication, encryption and
 	  decryption operations on incoming/outgoing frames.
 
-source "subsys/net/ip/l2/ieee802154/Kconfig.radio"
+source "subsys/net/l2/ieee802154/Kconfig.radio"
 
 endif
diff --git a/subsys/net/ip/l2/ieee802154/Kconfig.radio → subsys/net/l2/ieee802154/Kconfig.radio b/subsys/net/ip/l2/ieee802154/Kconfig.radio → subsys/net/l2/ieee802154/Kconfig.radio
diff --git a/subsys/net/ip/l2/ieee802154/ieee802154.c → subsys/net/l2/ieee802154/ieee802154.c b/subsys/net/ip/l2/ieee802154/ieee802154.c → subsys/net/l2/ieee802154/ieee802154.c
diff --git a/...et/ip/l2/ieee802154/ieee802154_fragment.c → ...s/net/l2/ieee802154/ieee802154_fragment.c b/...et/ip/l2/ieee802154/ieee802154_fragment.c → ...s/net/l2/ieee802154/ieee802154_fragment.c
diff --git a/...et/ip/l2/ieee802154/ieee802154_fragment.h → ...s/net/l2/ieee802154/ieee802154_fragment.h b/...et/ip/l2/ieee802154/ieee802154_fragment.h → ...s/net/l2/ieee802154/ieee802154_fragment.h
diff --git a/...s/net/ip/l2/ieee802154/ieee802154_frame.c → subsys/net/l2/ieee802154/ieee802154_frame.c b/...s/net/ip/l2/ieee802154/ieee802154_frame.c → subsys/net/l2/ieee802154/ieee802154_frame.c
diff --git a/...s/net/ip/l2/ieee802154/ieee802154_frame.h → subsys/net/l2/ieee802154/ieee802154_frame.h b/...s/net/ip/l2/ieee802154/ieee802154_frame.h → subsys/net/l2/ieee802154/ieee802154_frame.h
diff --git a/...ys/net/ip/l2/ieee802154/ieee802154_mgmt.c → subsys/net/l2/ieee802154/ieee802154_mgmt.c b/...ys/net/ip/l2/ieee802154/ieee802154_mgmt.c → subsys/net/l2/ieee802154/ieee802154_mgmt.c
diff --git a/...t/ip/l2/ieee802154/ieee802154_mgmt_priv.h → .../net/l2/ieee802154/ieee802154_mgmt_priv.h b/...t/ip/l2/ieee802154/ieee802154_mgmt_priv.h → .../net/l2/ieee802154/ieee802154_mgmt_priv.h
diff --git a/...ip/l2/ieee802154/ieee802154_radio_aloha.c → ...et/l2/ieee802154/ieee802154_radio_aloha.c b/...ip/l2/ieee802154/ieee802154_radio_aloha.c → ...et/l2/ieee802154/ieee802154_radio_aloha.c
diff --git a/.../l2/ieee802154/ieee802154_radio_csma_ca.c → .../l2/ieee802154/ieee802154_radio_csma_ca.c b/.../l2/ieee802154/ieee802154_radio_csma_ca.c → .../l2/ieee802154/ieee802154_radio_csma_ca.c
diff --git a/...ip/l2/ieee802154/ieee802154_radio_utils.h → ...et/l2/ieee802154/ieee802154_radio_utils.h b/...ip/l2/ieee802154/ieee802154_radio_utils.h → ...et/l2/ieee802154/ieee802154_radio_utils.h
diff --git a/...et/ip/l2/ieee802154/ieee802154_security.c → ...s/net/l2/ieee802154/ieee802154_security.c b/...et/ip/l2/ieee802154/ieee802154_security.c → ...s/net/l2/ieee802154/ieee802154_security.c
diff --git a/...et/ip/l2/ieee802154/ieee802154_security.h → ...s/net/l2/ieee802154/ieee802154_security.h b/...et/ip/l2/ieee802154/ieee802154_security.h → ...s/net/l2/ieee802154/ieee802154_security.h
diff --git a/...s/net/ip/l2/ieee802154/ieee802154_shell.c → subsys/net/l2/ieee802154/ieee802154_shell.c b/...s/net/ip/l2/ieee802154/ieee802154_shell.c → subsys/net/l2/ieee802154/ieee802154_shell.c
diff --git a/...s/net/ip/l2/ieee802154/ieee802154_utils.h → subsys/net/l2/ieee802154/ieee802154_utils.h b/...s/net/ip/l2/ieee802154/ieee802154_utils.h → subsys/net/l2/ieee802154/ieee802154_utils.h
diff --git a/subsys/net/ip/l2/openthread/CMakeLists.txt → subsys/net/l2/openthread/CMakeLists.txt b/subsys/net/ip/l2/openthread/CMakeLists.txt → subsys/net/l2/openthread/CMakeLists.txt
@@ -1,5 +1,6 @@
 zephyr_library_named(subsys__net__ip__l2__openthread)
-zephyr_library_include_directories(. ../.. ../../../lib/openthread/platform)
+zephyr_library_include_directories(. ../../lib/openthread/platform
+  ${ZEPHYR_BASE}/subsys/net/ip)
 zephyr_library_compile_definitions_ifdef(
   CONFIG_NEWLIB_LIBC __LINUX_ERRNO_EXTENSIONS__
   )

diff --git a/subsys/net/ip/l2/openthread/Kconfig → subsys/net/l2/openthread/Kconfig b/subsys/net/ip/l2/openthread/Kconfig → subsys/net/l2/openthread/Kconfig
diff --git a/subsys/net/ip/l2/openthread/openthread.c → subsys/net/l2/openthread/openthread.c b/subsys/net/ip/l2/openthread/openthread.c → subsys/net/l2/openthread/openthread.c
diff --git a/...s/net/ip/l2/openthread/openthread_utils.c → subsys/net/l2/openthread/openthread_utils.c b/...s/net/ip/l2/openthread/openthread_utils.c → subsys/net/l2/openthread/openthread_utils.c
diff --git a/...s/net/ip/l2/openthread/openthread_utils.h → subsys/net/l2/openthread/openthread_utils.h b/...s/net/ip/l2/openthread/openthread_utils.h → subsys/net/l2/openthread/openthread_utils.h
diff --git a/subsys/net/ip/l2/wifi_mgmt.c → subsys/net/l2/wifi_mgmt.c b/subsys/net/ip/l2/wifi_mgmt.c → subsys/net/l2/wifi_mgmt.c
diff --git a/subsys/net/ip/l2/wifi_shell.c → subsys/net/l2/wifi_shell.c b/subsys/net/ip/l2/wifi_shell.c → subsys/net/l2/wifi_shell.c