diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/lwip/net-lwip.c | 15 | ||||
| -rw-r--r-- | net/tcp.c | 2 | ||||
| -rw-r--r-- | net/wget.c | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/net/lwip/net-lwip.c b/net/lwip/net-lwip.c index 3918d57d7e5..660ceb10cbe 100644 --- a/net/lwip/net-lwip.c +++ b/net/lwip/net-lwip.c @@ -184,16 +184,12 @@ int net_lwip_eth_start(void) int ret; net_init(); - if (eth_is_on_demand_init()) { + eth_halt(); + eth_set_current(); + ret = eth_init(); + if (ret < 0) { eth_halt(); - eth_set_current(); - ret = eth_init(); - if (ret < 0) { - eth_halt(); - return ret; - } - } else { - eth_init_state_only(); + return ret; } return 0; @@ -285,7 +281,6 @@ int net_init(void) if (!init_done) { eth_init_rings(); - eth_init(); lwip_init(); init_done = true; } diff --git a/net/tcp.c b/net/tcp.c index 2635727f47d..8740150365f 100644 --- a/net/tcp.c +++ b/net/tcp.c @@ -804,7 +804,7 @@ void tcp_parse_options(struct tcp_stream *tcp, uchar *o, int o_len) } /* Process optional NOPs */ - if (p[0] == TCP_O_NOP) + if (p[0] == TCP_1_NOP) p++; else p += p[1]; diff --git a/net/wget.c b/net/wget.c index 3c0fff488eb..428ee072330 100644 --- a/net/wget.c +++ b/net/wget.c @@ -214,7 +214,7 @@ static void tcp_stream_on_rcv_nxt_update(struct tcp_stream *tcp, u32 rx_bytes) content_length = -1; } - if (content_length >= 0) { + if (content_length != -1) { debug_cond(DEBUG_WGET, "wget: Connected Len %lu\n", content_length); |