net: Remove <common.h> and add needed includes

Remove <common.h> from all "net/" files and when needed add
missing include files directly.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/net/arp.c b/net/arp.c
index 37848ad32fbd482591067b87152ed0516386b752..bc1e25f941f721d0d165cc185c62a49137885a9a 100644 (file)
--- a/net/arp.c
+++ b/net/arp.c
@@ -9,10 +9,10 @@
  *     Copyright 2000-2002 Wolfgang Denk, wd@denx.de
  */
 
-#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 
 #include "arp.h"

diff --git a/net/bootp.c b/net/bootp.c
index 86c56803c76eb146f42b42ad0da915d1ace51e11..9dfb50749b499fd5a709050480fc566412158cea 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -8,7 +8,6 @@
  *     Copyright 2000-2004 Wolfgang Denk, wd@denx.de
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <env.h>

diff --git a/net/cdp.c b/net/cdp.c
index a8f890e75226f4b4198046fca67acd17ea8c2019..d4cfc587ee3563f23f6e0fc63319237dcae6c148 100644 (file)
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -9,7 +9,6 @@
  *     Copyright 2000-2002 Wolfgang Denk, wd@denx.de
  */
 
-#include <common.h>
 #include <net.h>
 
 #include "cdp.h"

diff --git a/net/dhcpv6.c b/net/dhcpv6.c
index 4aea779f6f24cd4ab1fe8dcefa6ddb5d3692bb35..54619ee69836268c03be1709be353df401b3f64c 100644 (file)
--- a/net/dhcpv6.c
+++ b/net/dhcpv6.c
@@ -7,7 +7,6 @@
 
 /* Simple DHCP6 network layer implementation. */
 
-#include <common.h>
 #include <net6.h>
 #include <malloc.h>
 #include <linux/delay.h>

diff --git a/net/dns.c b/net/dns.c
index 5b1fe5b0103747a0fe91c5c17bc69a8f2801dfb9..c2f0ab98c8d040945551218ec4658412d8ec04c9 100644 (file)
--- a/net/dns.c
+++ b/net/dns.c
@@ -22,7 +22,6 @@
  * this stuff is worth it, you can buy me a beer in return.
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <log.h>

diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 3d0ec91dfa495b8d2ce1bfd3a96851b59be66fa6..4e3933fd05f35b4fbccbb26a6ec83b4502038f99 100644 (file)
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -7,7 +7,6 @@
 
 #define LOG_CATEGORY UCLASS_ETH
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootstage.h>
 #include <dm.h>

diff --git a/net/eth_bootdev.c b/net/eth_bootdev.c
index 869adf8cbbd31900339e432347417087937f949f..6ee54e3c79014b94023dfdc8968ae48bbf52dd80 100644 (file)
--- a/net/eth_bootdev.c
+++ b/net/eth_bootdev.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <command.h>

diff --git a/net/eth_common.c b/net/eth_common.c
index 14d4c07b695d5d68076eafc146b4b0a0fd710bf3..89b5bb371897ee77e3de7cb50043aba90159123a 100644 (file)
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -5,7 +5,6 @@
  * Joe Hershberger, National Instruments
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <dm.h>
 #include <env.h>

diff --git a/net/fastboot_tcp.c b/net/fastboot_tcp.c
index 2eb52ea256796d217854afed3aab6a4ba62801bc..d1fccbc72386318824ac54abf90356bbb47c3d32 100644 (file)
--- a/net/fastboot_tcp.c
+++ b/net/fastboot_tcp.c
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 The Android Open Source Project
  */
 
-#include <common.h>
 #include <fastboot.h>
 #include <net.h>
 #include <net/fastboot_tcp.h>

diff --git a/net/fastboot_udp.c b/net/fastboot_udp.c
index 6fee441ab3b6e6476911a210bf28edc64bdc55da..d1479510d61aa02f23bec74199531063a7e88b84 100644 (file)
--- a/net/fastboot_udp.c
+++ b/net/fastboot_udp.c
@@ -3,7 +3,6 @@
  * Copyright (C) 2016 The Android Open Source Project
  */
 
-#include <common.h>
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>

diff --git a/net/link_local.c b/net/link_local.c
index 8aec3c79969b023e024820e0558072268a1e912e..179721333ffc3f0c3970dee13078a17b796cb36d 100644 (file)
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -11,7 +11,6 @@
  * Licensed under the GPL v2 or later
  */
 
-#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>

diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index 94b90e0657626b2cdbe342ac9d94f2893acb48a6..ee188b504d166ab8d64995e3832ae57755329edd 100644 (file)
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -4,7 +4,6 @@
  * Alex Marginean, NXP
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>

diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 0ebfb2f1343a091f36169e5a05a5101ffee7faaf..4f052ae432c659eb3c5ca5e10537eef2d9a62209 100644 (file)
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -4,7 +4,6 @@
  * Alex Marginean, NXP
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/lists.h>
 #include <eth_phy.h>

diff --git a/net/ndisc.c b/net/ndisc.c
index d1cec0601c83ea10961f50bcc344399e0a3caa3b..d417c5987ac4a4de8fb544834f375ae6fa2ada62 100644 (file)
--- a/net/ndisc.c
+++ b/net/ndisc.c
@@ -9,7 +9,6 @@
 
 /* Neighbour Discovery for IPv6 */
 
-#include <common.h>
 #include <net.h>
 #include <net6.h>
 #include <ndisc.h>

diff --git a/net/net.c b/net/net.c
index 0fb2d2507734ebd8f4061f280d412fc3d36475e9..23b5d3356afa1937ad8ef532026dde281d57c779 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -81,7 +81,6 @@
  */
 
 
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <console.h>

diff --git a/net/net6.c b/net/net6.c
index 2dd64c0e1618a061ae424e0eea3fccd2c7e648ef..4cff98df15cf15df21957c50419a77e8e6d12492 100644 (file)
--- a/net/net6.c
+++ b/net/net6.c
@@ -9,12 +9,12 @@
 
 /* Simple IPv6 network layer implementation */
 
-#include <common.h>
 #include <env_internal.h>
 #include <malloc.h>
 #include <net.h>
 #include <net6.h>
 #include <ndisc.h>
+#include <vsprintf.h>
 
 /* NULL IPv6 address */
 struct in6_addr const net_null_addr_ip6 = ZERO_IPV6_ADDR;

diff --git a/net/nfs.c b/net/nfs.c
index c18282448ccd87bc11e09bfbdceb7e8ed9dddaf7..acc7106f10d4564ddea80d1280ba2f8cf605ce43 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -30,7 +30,6 @@
  * September 27, 2018. As of now, NFSv3 is the default choice. If the server
  * does not support NFSv3, we fall back to versions 2 or 1. */
 
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #ifdef CONFIG_SYS_DIRECT_FLASH_NFS

diff --git a/net/pcap.c b/net/pcap.c
index 4036d8a3fa535c6e7246460449513acc89ed2386..c959e3e4e5114bda55e6a6d03b3a56466823661a 100644 (file)
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -3,10 +3,10 @@
  * Copyright 2019 Ramon Fried <rfried.dev@gmail.com>
  */
 
-#include <common.h>
 #include <net.h>
 #include <net/pcap.h>
 #include <time.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 
 #define LINKTYPE_ETHERNET      1

diff --git a/net/ping6.c b/net/ping6.c
index 4882a17f510b72229aeed2f529f1772b31da114a..2479e08fd82f2d04fe48a8459608777ce4d54215 100644 (file)
--- a/net/ping6.c
+++ b/net/ping6.c
@@ -9,7 +9,6 @@
 
 /* Simple ping6 implementation */
 
-#include <common.h>
 #include <net.h>
 #include <net6.h>
 #include "ndisc.h"

diff --git a/net/rarp.c b/net/rarp.c
index 231b6233c07a7f07e41d1a1842ee8780f556c063..a6b564e314d47d2c5b55e2c3b4c5a3f1130b471f 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <net.h>

diff --git a/net/sntp.c b/net/sntp.c
index dac0f8ceea1b9583a855b8f908f008df52962dc3..73d1d87d38b1aff2b1cf66a17076510969e32859 100644 (file)
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <log.h>

diff --git a/net/tcp.c b/net/tcp.c
index a713e1dd6096134e45aa44367dce672167849dc8..b0cc8a1fe3ed6d65ab244f497ac338ed2bb7a58a 100644 (file)
--- a/net/tcp.c
+++ b/net/tcp.c
@@ -17,7 +17,6 @@
  *                      - TCP application (eg wget)
  *      Next Step       HTTPS?
  */
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <env_internal.h>

diff --git a/net/tftp.c b/net/tftp.c
index 2e335413492b714cdaaa594c2385553f0f19eca5..6b16bdcbe4c2e685269177da4b7f9245d9ac7e57 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -5,7 +5,6 @@
  * Copyright 2011 Comelit Group SpA,
  *                Luca Ceresoli <luca.ceresoli@comelit.it>
  */
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <efi_loader.h>

diff --git a/net/udp.c b/net/udp.c
index a93822f511cdaa2da66f5415c3075e6caef7e469..37162260d17528137f2680a5aa8045cd60453e91 100644 (file)
--- a/net/udp.c
+++ b/net/udp.c
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Philippe Reynes <philippe.reynes@softathome.com>
  */
 
-#include <common.h>
 #include <net.h>
 #include <net/udp.h>
 

diff --git a/net/wget.c b/net/wget.c
index abab371e58edbcbddbf96cabb67af870f420b370..f1dd7abeff69a75510f650f646ea71c932177b83 100644 (file)
--- a/net/wget.c
+++ b/net/wget.c
@@ -6,7 +6,6 @@
 
 #include <asm/global_data.h>
 #include <command.h>
-#include <common.h>
 #include <display_options.h>
 #include <env.h>
 #include <image.h>

diff --git a/net/wol.c b/net/wol.c
index 0a625668a992ef4fd6feb8c8cf4084b6020ccfd8..96478ba5751e78c902275ed4da65303b292365fe 100644 (file)
--- a/net/wol.c
+++ b/net/wol.c
@@ -3,7 +3,6 @@
  * Copyright 2018 Lothar Felten, lothar.felten@gmail.com
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <net.h>