net/: Remove references to CONFIG_NET_MULTIBUFFER

This commit is contained in:
Gregory Nutt 2016-11-29 16:12:39 -06:00
parent c09ae58e3f
commit 00beb665f5
4 changed files with 8 additions and 21 deletions

View File

@ -40,17 +40,6 @@ config NET_PROMISCUOUS
menu "Driver buffer configuration" menu "Driver buffer configuration"
config NET_MULTIBUFFER
bool "Use multiple device-side I/O buffers"
default n
---help---
Traditionally, the uIP-based stack has used a single buffer for all
incoming and outgoing traffic. If this configuration is selected,
then the driver can manage multiple I/O buffers and can, for
example, be filling one input buffer while sending another output
buffer. Or, as another example, the driver may support queuing of
concurrent input/ouput and output transfers for better performance.
config NET_ETH_MTU config NET_ETH_MTU
int "Ethernet packet buffer size (MTU)" int "Ethernet packet buffer size (MTU)"
default 1294 if NET_IPv6 default 1294 if NET_IPv6
@ -171,8 +160,7 @@ config NET_SLIP
select NET_MULTILINK if NET_ETHERNET || NET_LOOPBACK || NET_TUN select NET_MULTILINK if NET_ETHERNET || NET_LOOPBACK || NET_TUN
---help--- ---help---
Enables building of the SLIP driver. SLIP requires Enables building of the SLIP driver. SLIP requires
at least one IP protocol selected and the following additional at least one IP protocol selected and CONFIG_NET_NOINTS.
network settings: NET_NOINTS and NET_MULTIBUFFER.
SLIP supports point-to-point IP communications over a serial port. SLIP supports point-to-point IP communications over a serial port.
The default data link layer for network layer is Ethernet. If The default data link layer for network layer is Ethernet. If
@ -217,7 +205,6 @@ config NET_TUN
default n default n
select NETDEV_MULTINIC if NET_ETHERNET || NET_LOOPBACK || NET_SLIP select NETDEV_MULTINIC if NET_ETHERNET || NET_LOOPBACK || NET_SLIP
select NET_MULTILINK if NET_ETHERNET || NET_LOOPBACK || NET_SLIP select NET_MULTILINK if NET_ETHERNET || NET_LOOPBACK || NET_SLIP
select NET_MULTIBUFFER
select ARCH_HAVE_NETDEV_STATISTICS select ARCH_HAVE_NETDEV_STATISTICS
if NET_TUN if NET_TUN

View File

@ -76,16 +76,16 @@
* that we previously sent out, the ARP cache will be filled in with * that we previously sent out, the ARP cache will be filled in with
* the values from the ARP reply. If the incoming ARP packet is an ARP * the values from the ARP reply. If the incoming ARP packet is an ARP
* request for our IP address, an ARP reply packet is created and put * request for our IP address, an ARP reply packet is created and put
* into the d_buf[] buffer. * into the d_buf buffer.
* *
* On entry, this function expects that an ARP packet with a prepended * On entry, this function expects that an ARP packet with a prepended
* Ethernet header is present in the d_buf[] buffer and that the length of * Ethernet header is present in the d_buf buffer and that the length of
* the packet is set in the d_len field. * the packet is set in the d_len field.
* *
* When the function returns, the value of the field d_len indicates whether * When the function returns, the value of the field d_len indicates whether
* the device driver should send out the ARP reply packet or not. If d_len * the device driver should send out the ARP reply packet or not. If d_len
* is zero, no packet should be sent; If d_len is non-zero, it contains the * is zero, no packet should be sent; If d_len is non-zero, it contains the
* length of the outbound packet that is present in the d_buf[] buffer. * length of the outbound packet that is present in the d_buf buffer.
* *
****************************************************************************/ ****************************************************************************/

View File

@ -123,13 +123,13 @@ static const uint8_t g_multicast_ethaddr[3] =
* beginning of the packet and the function returns. * beginning of the packet and the function returns.
* *
* If no ARP cache entry is found for the destination IP address, the * If no ARP cache entry is found for the destination IP address, the
* packet in the d_buf[] is replaced by an ARP request packet for the * packet in the d_buf is replaced by an ARP request packet for the
* IP address. The IP packet is dropped and it is assumed that the * IP address. The IP packet is dropped and it is assumed that the
* higher level protocols (e.g., TCP) eventually will retransmit the * higher level protocols (e.g., TCP) eventually will retransmit the
* dropped packet. * dropped packet.
* *
* Upon return in either the case, a packet to be sent is present in the * Upon return in either the case, a packet to be sent is present in the
* d_buf[] buffer and the d_len field holds the length of the Ethernet * d_buf buffer and the d_len field holds the length of the Ethernet
* frame that should be transmitted. * frame that should be transmitted.
* *
****************************************************************************/ ****************************************************************************/

View File

@ -120,13 +120,13 @@ static const uint8_t g_multicast_ethaddr[3] =
* beginning of the packet and the function returns. * beginning of the packet and the function returns.
* *
* If no Neighbor Table entry is found for the destination IPv6 address, * If no Neighbor Table entry is found for the destination IPv6 address,
* the packet in the d_buf[] is replaced by an ICMPv6 Neighbor Solicit * the packet in the d_buf is replaced by an ICMPv6 Neighbor Solicit
* request packet for the IPv6 address. The IPv6 packet is dropped and * request packet for the IPv6 address. The IPv6 packet is dropped and
* it is assumed that the higher level protocols (e.g., TCP) eventually * it is assumed that the higher level protocols (e.g., TCP) eventually
* will retransmit the dropped packet. * will retransmit the dropped packet.
* *
* Upon return in either the case, a packet to be sent is present in the * Upon return in either the case, a packet to be sent is present in the
* d_buf[] buffer and the d_len field holds the length of the Ethernet * d_buf buffer and the d_len field holds the length of the Ethernet
* frame that should be transmitted. * frame that should be transmitted.
* *
****************************************************************************/ ****************************************************************************/