diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2014-12-18 09:35:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2014-12-18 09:35:35 +0100 |
| commit | cb736edff2fe6f4f0e500938096e975ca04690ae (patch) | |
| tree | 01a250ce107c792e69f114bf0b4196e17e29c70e /target/linux/config | |
| parent | c6e1f2df0c9b712f81f8d1ef792567fa8d178d69 (diff) | |
| parent | ff363a45695e5828f26fd547018f7e00deb5e334 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.addons | 7 | ||||
| -rw-r--r-- | target/linux/config/Config.in.network | 15 |
2 files changed, 14 insertions, 8 deletions
diff --git a/target/linux/config/Config.in.addons b/target/linux/config/Config.in.addons index bdc2f4e78..1ea6b7315 100644 --- a/target/linux/config/Config.in.addons +++ b/target/linux/config/Config.in.addons @@ -15,5 +15,10 @@ config ADK_KERNEL_ADDON_MPTCP config ADK_KERNEL_ADDON_FBLOGO boolean - depends on ADK_KERNEL_VERSION_3_15 depends on ADK_KERNEL_VERSION_3_14 + +config ADK_KERNEL_ADDON_DIETNET + boolean + depends on ADK_KERNEL_VERSION_3_14 + depends on ADK_KERNEL_VERSION_3_12 + depends on ADK_KERNEL_VERSION_3_10 diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 761fce117..6e20a190e 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -4,8 +4,15 @@ config ADK_KERNEL_IP_FIB_HASH boolean default y +config ADK_DISABLE_TCP_FASTOPEN + prompt "Disable TCP Fastopen" + boolean + select ADK_KERNEL_ADDON_DIETNET + default n + config ADK_KERNEL_SYN_COOKIES - boolean "IP: TCP syncookie support" + prompt "IP: TCP syncookie support" + boolean default n config ADK_KERNEL_IP_PNP_BOOTP @@ -40,12 +47,6 @@ config ADK_KERNEL_LLC tristate default n -config ADK_KERNEL_TCP_FASTOPEN - prompt "Enable TCP Fastopen" - select ADK_KERNEL_CRYPTO - select ADK_KERNEL_CRYPTO_AES - boolean - default n config ADK_KERNEL_IP_MULTICAST prompt "Enable IP Multicasting" |