Skip to content

Remove unselectable CONFIG_NET_TCP_READHEAD dependencies. #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2020
Merged

Remove unselectable CONFIG_NET_TCP_READHEAD dependencies. #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions examples/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,6 @@ examples/netloop
CONFIG_NET_LOOPBACK - Requires local loopback supprt
CONFIG_NET_TCP - Requires TCP support with the following:
CONFIG_NET_TCPBACKLOG
CONFIG_NET_TCP_READAHEAD
CONFIG_NET_TCP_WRITE_BUFFERS
CONFIG_NET_IPv4 - Currently supports only IPv4

Expand Down Expand Up @@ -1229,7 +1228,6 @@ examples/poll

CONFIG_NET - Defined for general network support
CONFIG_NET_TCP - Defined for TCP/IP support
CONFIG_NET_TCP_READAHEAD - Defined
CONFIG_NET_NTCP_READAHEAD_BUFFERS - Defined to be greater than zero

CONFIG_EXAMPLES_POLL_NOMAC - (May be defined to use software assigned MAC)
Expand Down
2 changes: 1 addition & 1 deletion examples/netloop/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
config EXAMPLES_NETLOOP
tristate "Local loopback example"
default n
depends on NET_LOOPBACK && NET_TCP && NET_TCPBACKLOG && NET_TCP_READAHEAD && NET_TCP_WRITE_BUFFERS && NET_IPv4
depends on NET_LOOPBACK && NET_TCP && NET_TCPBACKLOG && NET_TCP_WRITE_BUFFERS && NET_IPv4
---help---
Enable the local loopback example

Expand Down
7 changes: 3 additions & 4 deletions examples/netloop/netloop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
* examples/netloop/netloop.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2015, 2020 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -56,16 +56,15 @@
* CONFIG_NET - Network support must be enabled
* CONFIG_NET_TCP - Only support on TCP (because read-ahead
* buffering s not yet support for UDP)
* CONFIG_NET_TCP_READAHEAD - TCP/IP read-ahead buffering must be enabled
*/


#ifndef CONFIG_NET
# error Network socket support not enabled
#endif

#if !defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_READAHEAD) || \
!defined(CONFIG_NET_TCPBACKLOG) || !defined(CONFIG_NET_TCP_WRITE_BUFFERS)
#if !defined(CONFIG_NET_TCP) || !defined(CONFIG_NET_TCPBACKLOG) || \
!defined(CONFIG_NET_TCP_WRITE_BUFFERS)
# error TCP not configured correctly
#endif

Expand Down
6 changes: 2 additions & 4 deletions examples/poll/poll_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
* examples/poll/poll_internal.h
*
* Copyright (C) 2008, 2009, 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2009, 2014, 2020 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -56,11 +56,9 @@
* CONFIG_NET - Network support must be enabled
* CONFIG_NET_TCP - Only support on TCP (because read-ahead
* buffering s not yet support for UDP)
* CONFIG_NET_TCP_READAHEAD - TCP/IP read-ahead buffering must be enabled
*/

#if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && \
defined(CONFIG_NET_TCP_READAHEAD)
#if defined(CONFIG_NET) && defined(CONFIG_NET_TCP)
# define HAVE_NETPOLL 1
#else
# undef HAVE_NETPOLL
Expand Down
4 changes: 2 additions & 2 deletions netutils/thttpd/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
* netutils/thttpd/config.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2020 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -53,7 +53,7 @@
#undef CONFIG_THTTPD
#if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && \
defined(CONFIG_NET_TCPBACKLOG) && !defined(CONFIG_DISABLE_ENVIRON) && \
!defined(CONFIG_SDCLONE_DISABLE) && defined(CONFIG_NET_TCP_READAHEAD)
!defined(CONFIG_SDCLONE_DISABLE)

# define CONFIG_THTTPD 1

Expand Down