OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net: Restore the default networking behavior on qemu platforms 

Commit e99b5228a1 changed the default
networking behavior on qemu platforms, as the SLIP_TAP driver no longer
selected Ethernet L2. In results, qemu platforms in default
configuration had no network interface to work with.

Fix this, by restoring select for NET_L2_ETHERNET, but this time in
NET_SLIP_TAP. The difference is that SLIP_TAP is a generic driver
config, which could be enabled on any platform, so not changing the
behavior here, while NET_SLIP_TAP is a config dedicated for qemu only,
so it's reasonable to enable all that's needed to get SLIP to work with
qemu by default.

As there were circular Kconfig dependencies, move the respective qemu
configs outside of NET_RAW_MODE if block (as this caused the circular
dependency with ETH_DRIVER_RAW_MODE). Also, remove dependency to
NET_L2_BT, as it made little sense there, and also caused dependency
problems.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2024-04-05 17:04:08 +02:00 committed by Anas Nashif
parent aee8dd1d33
commit eeb527a5da
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
subsys/net/ip/Kconfig
View File

@ -88,8 +88,6 @@ config NET_RAW_MODE
net_pkt part. It is currently used only by IEEE 802.15.4 drivers,
though any type of net drivers could use it.
if !NET_RAW_MODE
choice NET_QEMU_NETWORKING
prompt "Qemu networking"
default NET_QEMU_PPP if NET_PPP
@ -134,6 +132,8 @@ config NET_QEMU_USER_EXTRA_ARGS
include host / guest port forwarding, device id, Network address
information etc. This string is appended to the QEMU "-net user" option.
if !NET_RAW_MODE
config NET_INIT_PRIO
int
default 90
@ -583,6 +583,8 @@ config NET_CONTEXT_RECV_PKTINFO
This way user can get extra information about the received data in the
socket.
endif # NET_RAW_MODE
config NET_SLIP_TAP
bool "TAP SLIP driver"
depends on NET_QEMU_SLIP
@ -591,15 +593,14 @@ config NET_SLIP_TAP
select UART_PIPE
select UART_INTERRUPT_DRIVEN
select SLIP_TAP
default y if (QEMU_TARGET && !NET_TEST && !NET_L2_BT)
select NET_L2_ETHERNET
default y if (QEMU_TARGET && !NET_TEST)
help
SLIP TAP support is necessary when testing with QEMU. The host
needs to have tunslip6 with TAP support running in order to
communicate via the SLIP driver. See net-tools project at
https://github.com/zephyrproject-rtos/net-tools for more details.
endif # NET_RAW_MODE
config NET_TEST
bool "Network Testing"
help