diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-14 21:22:45 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-14 21:22:45 -0600 |
| commit | 3680d6ee7bd45c9171d3ecaad0e777d6c8c85ff5 (patch) | |
| tree | 1ec7fb90b733bea1a376ce5b66e283196247bd52 /nuttx | |
| parent | 3de9acf7e0a59068732afcb13ea442080759eeba (diff) | |
| download | px4-nuttx-3680d6ee7bd45c9171d3ecaad0e777d6c8c85ff5.tar.gz px4-nuttx-3680d6ee7bd45c9171d3ecaad0e777d6c8c85ff5.tar.bz2 px4-nuttx-3680d6ee7bd45c9171d3ecaad0e777d6c8c85ff5.zip | |
NET: Fix some some more ARP/Ethernet releated configuration
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/include/nuttx/net/netconfig.h | 4 | ||||
| -rw-r--r-- | nuttx/net/arp/Kconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/include/nuttx/net/netconfig.h b/nuttx/include/nuttx/net/netconfig.h index 08bbfc08a..72f3c3e5d 100644 --- a/nuttx/include/nuttx/net/netconfig.h +++ b/nuttx/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/nuttx/net/arp/Kconfig b/nuttx/net/arp/Kconfig index f093a0ead..5cb60e0da 100644 --- a/nuttx/net/arp/Kconfig +++ b/nuttx/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 |