env: Rename setenv() to env_set()

[u-boot] / net / arp.c

diff --git a/net/arp.c b/net/arp.c
index b8655700a828f78439c9499c5fbab5bc90a0c4a6..4c79e09ccbf6d8cb3ba49a31f98bf26aedaa0ae2 100644 (file)
--- a/net/arp.c
+++ b/net/arp.c
@@ -96,12 +96,12 @@ void arp_request(void)
        arp_raw_request(net_ip, net_null_ethaddr, net_arp_wait_reply_ip);
 }
 
-void arp_timeout_check(void)
+int arp_timeout_check(void)
 {
        ulong t;
 
        if (!net_arp_wait_packet_ip.s_addr)
-               return;
+               return 0;
 
        t = get_timer(0);
 
@@ -112,19 +112,19 @@ void arp_timeout_check(void)
                if (arp_wait_try >= ARP_TIMEOUT_COUNT) {
                        puts("\nARP Retry count exceeded; starting again\n");
                        arp_wait_try = 0;
-                       net_start_again();
+                       net_set_state(NETLOOP_FAIL);
                } else {
                        arp_wait_timer_start = t;
                        arp_request();
                }
        }
+       return 1;
 }
 
 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;
 
        /*
@@ -162,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);
@@ -196,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