X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=net%2Farp.c;h=990b771c92118c330fc3f544464bfef96aa482e9;hb=2c3f9261c80e8171ba813f8baef958c1edac3f0d;hp=824d2e9393550ea250f357b2762cf2f465e5fe66;hpb=588eec2a8603ee8a8e2e913895767c4c02d523af;p=u-boot diff --git a/net/arp.c b/net/arp.c index 824d2e9393..990b771c92 100644 --- a/net/arp.c +++ b/net/arp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd@denx.de - * SPDX-License-Identifier: GPL-2.0 */ #include @@ -125,7 +125,6 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) { struct arp_hdr *arp; struct in_addr reply_ip_addr; - uchar *pkt; int eth_hdr_size; /* @@ -163,9 +162,7 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) case ARPOP_REQUEST: /* reply with our IP address */ debug_cond(DEBUG_DEV_PKT, "Got ARP REQUEST, return our IP\n"); - pkt = (uchar *)et; eth_hdr_size = net_update_ether(et, et->et_src, PROT_ARP); - pkt += eth_hdr_size; arp->ar_op = htons(ARPOP_REPLY); memcpy(&arp->ar_tha, &arp->ar_sha, ARP_HLEN); net_copy_ip(&arp->ar_tpa, &arp->ar_spa); @@ -197,7 +194,7 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) if (net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) { char buf[20]; sprintf(buf, "%pM", &arp->ar_sha); - setenv("serveraddr", buf); + env_set("serveraddr", buf); } #endif