diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig
index 90d5deee6e3..cead906ae54 100644
--- a/configs/stm32f4discovery/netnsh/defconfig
+++ b/configs/stm32f4discovery/netnsh/defconfig
@@ -730,8 +730,12 @@ CONFIG_ARCH_HAVE_NET=y
 CONFIG_ARCH_HAVE_PHY=y
 CONFIG_NET=y
 # CONFIG_NET_NOINTS is not set
-CONFIG_NET_MULTIBUFFER=y
 # CONFIG_NET_PROMISCUOUS is not set
+
+#
+# Driver buffer configuration
+#
+CONFIG_NET_MULTIBUFFER=y
 CONFIG_NET_ETH_MTU=590
 CONFIG_NET_ETH_TCP_RECVWNDO=536
 CONFIG_NET_GUARDSIZE=2
diff --git a/net/Kconfig b/net/Kconfig
index baad94ae0f5..5eb06b7fae4 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -69,7 +69,7 @@ config NET_ETH_MTU
 		resulting in a minimum buffer size of of 1220+20+40+14 = 1294
 
 config NET_ETH_TCP_RECVWNDO
-	int "Ethernet receive window size"
+	int "Ethernet TCP receive window size"
 	default 1220 if NET_IPv6
 	default 536 if !NET_IPv6
 	depends on NET_ETHERNET && NET_TCP
@@ -93,7 +93,7 @@ config NET_SLIP_MTU
 		recommended.
 
 config NET_SLIP_TCP_RECVWNDO
-	int "SLIP receive window size"
+	int "SLIP TCP receive window size"
 	default 256
 	depends on NET_SLIP && NET_TCP
 	---help---
@@ -113,7 +113,7 @@ config NET_GUARDSIZE
 		packet size will be chopped down to the size indicated in the TCP
 		header.
 
-end menu # Driver buffer configuration
+endmenu # Driver buffer configuration
 
 menu "Data link support"
 
diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c
index 6b90e7ba78e..231bafa43aa 100644
--- a/net/netdev/netdev_register.c
+++ b/net/netdev/netdev_register.c
@@ -136,7 +136,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
             dev->d_llhdrlen = ETH_HDRLEN;
             dev->d_mtu      = CONFIG_NET_ETH_MTU;
 #ifdef CONFIG_NET_TCP
-            dev->d_recvwndo = CONFIG_NET_ETH_RECVWNDO;
+            dev->d_recvwndo = CONFIG_NET_ETH_TCP_RECVWNDO;
 #endif
             devfmt          = NETDEV_ETH_FORMAT;
             break;
@@ -147,7 +147,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
             dev->d_llhdrlen = 0;
             dev->d_mtu      = CONFIG_NET_SLIP_MTU;
 #ifdef CONFIG_NET_TCP
-            dev->d_recvwndo = CONFIG_NET_SLIP_RECVWNDO;
+            dev->d_recvwndo = CONFIG_NET_SLIP_TCP_RECVWNDO;
 #endif
             devfmt          = NETDEV_SLIP_FORMAT;
             break;
@@ -158,7 +158,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
             dev->d_llhdrlen = 0;
             dev->d_mtu      = CONFIG_NET_PPP_MTU;
 #ifdef CONFIG_NET_TCP
-            dev->d_recvwndo = CONFIG_NET_PPP_RECVWNDO;
+            dev->d_recvwndo = CONFIG_NET_PPP_TCP_RECVWNDO;
 #endif
             devfmt          = NETDEV_PPP_FORMAT;
             break;