diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-02 22:05:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-02 22:05:35 -0500 |
| commit | a4ef0657e3075d0f951d78cc1398cb7e05af648a (patch) | |
| tree | 9a4387de5845e6fd1331f0af32bfd82fac9eb039 /net | |
| parent | 357040645f9f56b33909520483df9f840be7e181 (diff) | |
| parent | cb3ef6810a27c8ddf5db8694bcef9337f27d12ce (diff) | |
Merge branch '2019-12-02-master-imports'
- A large series of clean-ups to reduce common.h contents
Diffstat (limited to 'net')
| -rw-r--r-- | net/link_local.c | 1 | ||||
| -rw-r--r-- | net/net.c | 3 | ||||
| -rw-r--r-- | net/nfs.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/net/link_local.c b/net/link_local.c index dd9fcad0874..1986b9b9d3b 100644 --- a/net/link_local.c +++ b/net/link_local.c @@ -14,6 +14,7 @@ #include <common.h> #include <env.h> #include <net.h> +#include <rand.h> #include "arp.h" #include "net_rand.h" diff --git a/net/net.c b/net/net.c index ded86e74567..0513444eb78 100644 --- a/net/net.c +++ b/net/net.c @@ -561,9 +561,6 @@ restart: */ for (;;) { WATCHDOG_RESET(); -#ifdef CONFIG_SHOW_ACTIVITY - show_activity(1); -#endif if (arp_timeout_check() > 0) time_start = get_timer(0); diff --git a/net/nfs.c b/net/nfs.c index aca0ca55f3f..97e62f1dceb 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -33,6 +33,7 @@ #include <mapmem.h> #include "nfs.h" #include "bootp.h" +#include <time.h> #define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */ #define NFS_RETRY_COUNT 30 |