diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-27 11:30:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-27 11:30:31 -0500 |
| commit | e6738b56e6799a67c0286fcceff9a7db7c006c7b (patch) | |
| tree | af66b7757762118e90e593f74da1ddcb4aef1610 /net/net.c | |
| parent | e262b2973e22174da666038514d17f0f7171466b (diff) | |
| parent | 69076dff2284ed099cc0583e5e64bd8012d1ab5c (diff) | |
Merge branch '2021-01-27-assorted-net-updates'
- e1000 fixes for MIPS
- netconsole and ping fix
- cortina_ni driver
- micrel PHY fix
- Add fdtoverlays keyword to extlinux file parsing
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/net.c b/net/net.c index ad7e3b3cf8e..b58f3062b20 100644 --- a/net/net.c +++ b/net/net.c @@ -412,7 +412,7 @@ int net_loop(enum proto_t protocol) bootstage_mark_name(BOOTSTAGE_ID_ETH_START, "eth_start"); net_init(); - if (eth_is_on_demand_init() || protocol != NETCONS) { + if (eth_is_on_demand_init()) { eth_halt(); eth_set_current(); ret = eth_init(); |