diff --git a/cmd/Kconfig b/cmd/Kconfig
index 642cc1116e8..ce8393c72da 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1833,12 +1833,10 @@ menuconfig CMD_NET
 	bool "Network commands"
 	default y
 
-endif
+if CMD_NET
 
 if NET
 
-if CMD_NET
-
 config CMD_BOOTP
 	bool "bootp"
 	default y
@@ -2079,7 +2077,6 @@ config IPV6_ROUTER_DISCOVERY
 	help
 	  Will automatically perform router solicitation on first IPv6
 	  network operation
-endif  # if CMD_NET
 
 config CMD_ETHSW
 	bool "ethsw"
@@ -2096,10 +2093,6 @@ config CMD_WOL
 
 endif  # if NET
 
-if NET || NET_LWIP
-
-if CMD_NET
-
 config CMD_DHCP
 	bool "dhcp"
 	select PROT_DHCP_LWIP if NET_LWIP
@@ -2175,8 +2168,6 @@ config WGET_HTTPS
 	help
 	  Enable TLS over http for wget.
 
-endif  # if CMD_NET
-
 config CMD_PXE
 	bool "pxe"
 	select PXE_UTILS
@@ -2184,7 +2175,9 @@ config CMD_PXE
 	help
 	  Boot image via network using PXE protocol
 
-endif  # if NET || NET_LWIP
+endif  # if CMD_NET
+
+endif # NET || NET_LWIP
 
 menu "Misc commands"
 
diff --git a/cmd/net-lwip.c b/cmd/net-lwip.c
index 0fd446ecb20..249556243d6 100644
--- a/cmd/net-lwip.c
+++ b/cmd/net-lwip.c
@@ -17,7 +17,7 @@ U_BOOT_CMD(ping, 2, 1, do_ping, "send ICMP ECHO_REQUEST to network host",
 
 #if defined(CONFIG_CMD_TFTPBOOT)
 U_BOOT_CMD(tftpboot, 3, 0, do_tftpb,
-	   "boot image via network using TFTP protocol\n",
+	   "boot image via network using TFTP protocol",
 	   "[loadAddress] [[hostIPaddr:]bootfilename]");
 #endif
 
diff --git a/include/net-common.h b/include/net-common.h
index 29d31f37263..89679e20860 100644
--- a/include/net-common.h
+++ b/include/net-common.h
@@ -518,7 +518,6 @@ int wget_do_request(ulong dst_addr, char *uri);
  * Return:	true if uri is valid, false if uri is invalid
  */
 bool wget_validate_uri(char *uri);
-//int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
 
 /**
  * enum wget_http_method - http method
diff --git a/net/lwip/net-lwip.c b/net/lwip/net-lwip.c
index cab1dd7d483..4d2aa6099dd 100644
--- a/net/lwip/net-lwip.c
+++ b/net/lwip/net-lwip.c
@@ -50,7 +50,7 @@ static err_t linkoutput(struct netif *netif, struct pbuf *p)
 	err = eth_get_ops(udev)->send(udev, pp ? pp : p->payload, p->len);
 	free(pp);
 	if (err) {
-		log_err("send error %d\n", err);
+		debug("send error %d\n", err);
 		return ERR_ABRT;
 	}
 
diff --git a/net/lwip/ping.c b/net/lwip/ping.c
index 200a702bbb5..c586a96806d 100644
--- a/net/lwip/ping.c
+++ b/net/lwip/ping.c
@@ -121,7 +121,7 @@ static int ping_loop(struct udevice *udev, const ip_addr_t *addr)
 
 	netif = net_lwip_new_netif(udev);
 	if (!netif)
-		return CMD_RET_FAILURE;
+		return -ENODEV;
 
 	printf("Using %s device\n", udev->name);