From 4ee084ab242d7fd9d2b94f66571c8129c7b8aa9b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 8 Aug 2017 18:37:00 -0600 Subject: [PATCH] Remove references to obsoleted CONFIG_NETDEV_MULTINIC and CONFIG_NETDEV_MULILINK. --- examples/bridge/Kconfig | 2 +- include/netutils/httpd.h | 5 ++--- netutils/tftpc/tftpc_internal.h | 9 ++++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/examples/bridge/Kconfig b/examples/bridge/Kconfig index c275fc331..5bb0f68cb 100644 --- a/examples/bridge/Kconfig +++ b/examples/bridge/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_BRIDGE bool "UDP bridge example" default n - depends on NET_UDP && NETDEV_MULTINIC && !NET_IPv6 + depends on NET_UDP && !NET_IPv6 ---help--- Simple test of a system with multiple networks. It simply echoes all UDP packets received on network 1 and network 2 to network 2 and diff --git a/include/netutils/httpd.h b/include/netutils/httpd.h index a5ca096b0..ff16ac1de 100644 --- a/include/netutils/httpd.h +++ b/include/netutils/httpd.h @@ -79,9 +79,8 @@ * buffer be sufficiently large to contain the entire GET request. * * In the case where there are multiple network devices with different - * link layer protocols (CONFIG_NET_MULTILINK), each network device - * may support a different TCP MSS value. Here we arbitrarily select - * the minimum MSS for that case. + * link layer protocols, each network device may support a different TCP + * MSS value. Here we arbitrarily select the minimum MSS for that case. */ #define HTTPD_IOBUFFER_SIZE (3*MIN_TCP_MSS) diff --git a/netutils/tftpc/tftpc_internal.h b/netutils/tftpc/tftpc_internal.h index 9d02bca04..87c96b5c1 100644 --- a/netutils/tftpc/tftpc_internal.h +++ b/netutils/tftpc/tftpc_internal.h @@ -91,11 +91,10 @@ * payload size (UDP_MSS), but cannot exceed 512 + sizeof(TFTP_DATA header). * * In the case where there are multiple network devices with different - * link layer protocols (CONFIG_NET_MULTILINK), each network device - * may support a different UDP MSS value. Here, if Ethernet is enabled, - * we (arbitrarily) assume that the Ethernet is link that will be used. - * if Ethernet is not one of the enabled interfaces, we (arbitrarily) select - * the minimum MSS. + * link layer protocols, each network device may support a different UDP MSS + * value. Here, if Ethernet is enabled, we (arbitrarily) assume that the + * Ethernet is link that will be used. If Ethernet is not one of the + * enabled interfaces, we (arbitrarily) select the minimum MSS. */ #define TFTP_DATAHEADERSIZE 4