From 64d18bfe12a97948a7ef8aca6afe1dcbf2209fcf Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 14 Nov 2014 21:22:45 -0600 Subject: [PATCH] NET: Fix some some more ARP/Ethernet releated configuration --- include/nuttx/net/netconfig.h | 4 ++-- net/arp/Kconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/nuttx/net/netconfig.h b/include/nuttx/net/netconfig.h index 08bbfc08a8..72f3c3e5dd 100644 --- a/include/nuttx/net/netconfig.h +++ b/include/nuttx/net/netconfig.h @@ -89,11 +89,11 @@ # ifdef CONFIG_NET_IPv6 # error "SLIP is not implemented for IPv6" # endif -# define NET_LL_HDRLEN 0 +# define NET_LL_HDRLEN 0 #else # define CONFIG_NET_ETHERNET 1 # define CONFIG_NET_ARP 1 -# define NET_LL_HDRLEN 14 +# define NET_LL_HDRLEN 14 #endif /* Layer 3/4 Configuration Options ******************************************/ diff --git a/net/arp/Kconfig b/net/arp/Kconfig index f093a0ead9..5cb60e0da8 100644 --- a/net/arp/Kconfig +++ b/net/arp/Kconfig @@ -7,8 +7,8 @@ menu "ARP Configuration" config NET_ARP bool - default y if !NET_SLIP - default n if NET_SLIP + default y + depends on NET_ETHERNET ---help--- This setting is currently overridden by logic in include/nuttx/net