mirror of
https://github.com/apache/nuttx.git
synced 2026-06-01 07:45:16 +08:00
Squashed commit of the following:
Fix a few typo/compilation problems.
net/: Remove all CONFIG_NET_xxx_TCP_RECVWNDO configuration variables. They were used only to initialize the d_recwndo of the network device structure which no longer exists.
net/: Remove the device TCP receive window field (d_recvwndo) from the device structure. That value is no longer retained, but is calculated dynamically.
Remove some dangling references to CONFIG_NET_TCP_RWND_CONTROL.
net/tcp: Take read-ahead throttling into account when calculating the TCP receive window size.
net/tcp: tcp_get_recvwindow() now returns the receive window size directly (vs. indirectly via the device structure).
net/tcp: Remove CONFIG_NET_TCP_RWND_CONTROL. TCP window algorithm is now trigged only by CONFIG_NET_TCP_READAHEAD.
This commit is contained in:
@@ -302,16 +302,6 @@ config NET_6LOWPAN_MTU
|
||||
sizes. Without fragmentation support, the MTU is equal to the frame
|
||||
size and that has already been selected.
|
||||
|
||||
config NET_6LOWPAN_TCP_RECVWNDO
|
||||
int "6LoWPAN TCP receive window size"
|
||||
default 1220
|
||||
depends on NET_TCP
|
||||
---help---
|
||||
The size of the advertised receiver's window. Should be set low
|
||||
(i.e., to the size of the IEEE802.15.4 MTU or frame payload) if
|
||||
the application is slow to process incoming data, or high (32768
|
||||
bytes) if the application processes data quickly.
|
||||
|
||||
config NET_6LOWPAN_DUMPBUFFER
|
||||
bool "Enable dumping of buffer data"
|
||||
default n
|
||||
|
||||
@@ -269,12 +269,12 @@ static int sixlowpan_tcp_header(FAR struct tcp_conn_s *conn,
|
||||
{
|
||||
/* Update the TCP received window based on I/O buffer availability */
|
||||
|
||||
tcp_update_recvwindws(dev);
|
||||
uint16 recvwndo = tcp_get_recvwindow(dev);
|
||||
|
||||
/* Set the TCP Window */
|
||||
|
||||
ipv6tcp->tcp.wnd[0] = ((NET_DEV_RCVWNDO(dev)) >> 8);
|
||||
ipv6tcp->tcp.wnd[1] = ((NET_DEV_RCVWNDO(dev)) & 0xff);
|
||||
ipv6tcp->tcp.wnd[0] = recvwndo >> 8;
|
||||
ipv6tcp->tcp.wnd[1] = recvwndo & 0xff;
|
||||
}
|
||||
|
||||
/* Calculate TCP checksum. */
|
||||
|
||||
Reference in New Issue
Block a user