diff --git a/Kconfig b/Kconfig
index dcd7d11c040..a0f61d3f2c2 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1684,9 +1684,6 @@ endmenu
 menu "Library Routines"
 source libs/libc/Kconfig
 source libs/libxx/Kconfig
-endmenu
-
-menu "DSP Library"
 source libs/libdsp/Kconfig
 endmenu
 
diff --git a/configs/viewtool-stm32f107/README.txt b/configs/viewtool-stm32f107/README.txt
index 2259351f1a8..bfdc3dff828 100644
--- a/configs/viewtool-stm32f107/README.txt
+++ b/configs/viewtool-stm32f107/README.txt
@@ -999,4 +999,14 @@ Configurations
     of much interest now other than for reference.
 
     This configuration targets the viewtool board with the STM32F103VCT6
-    mounted.  It uses TIM6 to generated high rate interrupts for the test.
+
+  tcpblaster:
+
+    The tcpblaster example derives from the nettest example and basicallyi
+    duplicates that application when the nettest PERFORMANCE option is selected.
+    tcpblaster has a little better reporting of performance stats, however.
+
+    This configuration derives directly from the netnsh configuration and most
+    of the notes there should applie equally here.
+
+
diff --git a/configs/viewtool-stm32f107/tcpblaster/defconfig b/configs/viewtool-stm32f107/tcpblaster/defconfig
new file mode 100644
index 00000000000..177a3764e45
--- /dev/null
+++ b/configs/viewtool-stm32f107/tcpblaster/defconfig
@@ -0,0 +1,70 @@
+# CONFIG_NSH_ARGCAT is not set
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+# CONFIG_NSH_CMDPARMS is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="viewtool-stm32f107"
+CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y
+CONFIG_ARCH_CHIP_STM32=y
+CONFIG_ARCH_CHIP_STM32F107VC=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_BOARD_LOOPSPERMSEC=5483
+CONFIG_BUILTIN=y
+CONFIG_ETH0_PHY_DP83848C=y
+CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_TCPBLASTER=y
+CONFIG_FS_PROCFS=y
+CONFIG_INTELHEX_BINARY=y
+CONFIG_IOB_NBUFFERS=50
+CONFIG_IOB_NCHAINS=12
+CONFIG_LIBC_FLOATINGPOINT=y
+CONFIG_MAX_TASKS=16
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_NET=y
+CONFIG_NETUTILS_TELNETD=y
+CONFIG_NET_ARP_SEND=y
+CONFIG_NET_ETH_PKTSIZE=1514
+CONFIG_NET_HOSTNAME="Viewtool-STM32F107"
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_ROUTE=y
+CONFIG_NET_SOCKOPTS=y
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_TCP=y
+CONFIG_NET_TCPBACKLOG=y
+CONFIG_NET_TCP_CONNS=40
+CONFIG_NET_TCP_WRITE_BUFFERS=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_NETINIT_THREAD=y
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_READLINE=y
+CONFIG_NSOCKET_DESCRIPTORS=10
+CONFIG_PREALLOC_MQ_MSGS=4
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_PREALLOC_WDOGS=16
+CONFIG_RAM_SIZE=65536
+CONFIG_RAM_START=0x20000000
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_HPWORKPRIORITY=192
+CONFIG_SCHED_HPWORKSTACKSIZE=1024
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_START_DAY=23
+CONFIG_STM32_ETHMAC=y
+CONFIG_STM32_JTAG_FULL_ENABLE=y
+CONFIG_STM32_PHYSR=16
+CONFIG_STM32_PHYSR_100MBPS=0x0000
+CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004
+CONFIG_STM32_PHYSR_MODE=0x0004
+CONFIG_STM32_PHYSR_SPEED=0x0002
+CONFIG_STM32_PWR=y
+CONFIG_STM32_RMII_EXTCLK=y
+CONFIG_STM32_USART1=y
+CONFIG_SYSTEM_PING=y
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_USART1_SERIAL_CONSOLE=y
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_WDOG_INTRESERVE=2
diff --git a/net/tcp/tcp_recvwindow.c b/net/tcp/tcp_recvwindow.c
index 4929e797eec..065f368c194 100644
--- a/net/tcp/tcp_recvwindow.c
+++ b/net/tcp/tcp_recvwindow.c
@@ -152,9 +152,9 @@ uint16_t tcp_get_recvwindow(FAR struct net_driver_s *dev)
        */
 
       rwnd = (navail * CONFIG_IOB_BUFSIZE) + mss;
-      if (rwnd > UINT16_MAX)
+      if (rwnd > INT16_MAX)
         {
-          rwnd = UINT16_MAX;
+          rwnd = INT16_MAX;
         }
 
       /* Save the new receive window size */