diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-24 15:30:06 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-24 15:30:06 -0500 |
| commit | 68489ed037530ec29fc0bc452ad6e4b0c5db02ec (patch) | |
| tree | b1fb961b98f1e9a5ab5c3f0dc80fcfc32e00e689 /net/net.c | |
| parent | 0c3b301f79fcad081c8509ee4cb06e7b0478c8c1 (diff) | |
| parent | 91c9cbabf935b37ab6c0b9b622e7faf0b350acb6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/net.c b/net/net.c index a5a216c3eee..58b0417cbe9 100644 --- a/net/net.c +++ b/net/net.c @@ -131,10 +131,6 @@ struct in_addr net_dns_server; struct in_addr net_dns_server2; #endif -#ifdef CONFIG_MCAST_TFTP /* Multicast TFTP */ -struct in_addr net_mcast_addr; -#endif - /** END OF BOOTP EXTENTIONS **/ /* Our ethernet address */ @@ -657,6 +653,7 @@ restart: /* Invalidate the last protocol */ eth_set_last_protocol(BOOTP); debug_cond(DEBUG_INT_STATE, "--- net_loop Fail!\n"); + ret = -ENONET; goto done; case NETLOOP_CONTINUE: @@ -1215,9 +1212,6 @@ void net_process_received_packet(uchar *in_packet, int len) dst_ip = net_read_ip(&ip->ip_dst); if (net_ip.s_addr && dst_ip.s_addr != net_ip.s_addr && dst_ip.s_addr != 0xFFFFFFFF) { -#ifdef CONFIG_MCAST_TFTP - if (net_mcast_addr != dst_ip) -#endif return; } /* Read source IP address for later use */ |