Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""

[u-boot.git] / net / arp.c

diff --git a/net/arp.c b/net/arp.c
index 824d2e9393550ea250f357b2762cf2f465e5fe66..37848ad32fbd482591067b87152ed0516386b752 100644 (file)
--- 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,27 +7,16 @@
  *     Copyright 2000 Roland Borde
  *     Copyright 2000 Paolo Scaffardi
  *     Copyright 2000-2002 Wolfgang Denk, [email protected]
- *     SPDX-License-Identifier:        GPL-2.0
  */
 
 #include <common.h>
+#include <env.h>
+#include <log.h>
+#include <net.h>
+#include <linux/delay.h>
 
 #include "arp.h"
 
-#ifndef        CONFIG_ARP_TIMEOUT
-/* Milliseconds before trying ARP again */
-# define ARP_TIMEOUT           5000UL
-#else
-# define ARP_TIMEOUT           CONFIG_ARP_TIMEOUT
-#endif
-
-
-#ifndef        CONFIG_NET_RETRY_COUNT
-# define ARP_TIMEOUT_COUNT     5       /* # of timeouts before giving up  */
-#else
-# define ARP_TIMEOUT_COUNT     CONFIG_NET_RETRY_COUNT
-#endif
-
 struct in_addr net_arp_wait_packet_ip;
 static struct in_addr net_arp_wait_reply_ip;
 /* MAC address of waiting packet's destination */
@@ -34,8 +24,7 @@ uchar        *arp_wait_packet_ethaddr;
 int            arp_wait_tx_packet_size;
 ulong          arp_wait_timer_start;
 int            arp_wait_try;
-
-static uchar   *arp_tx_packet; /* THE ARP transmit packet */
+uchar         *arp_tx_packet; /* THE ARP transmit packet */
 static uchar   arp_tx_packet_buf[PKTSIZE_ALIGN + PKTALIGN];
 
 void arp_init(void)
@@ -100,16 +89,16 @@ int arp_timeout_check(void)
 {
        ulong t;
 
-       if (!net_arp_wait_packet_ip.s_addr)
+       if (!arp_is_waiting())
                return 0;
 
        t = get_timer(0);
 
        /* check for arp timeout */
-       if ((t - arp_wait_timer_start) > ARP_TIMEOUT) {
+       if ((t - arp_wait_timer_start) > CONFIG_ARP_TIMEOUT) {
                arp_wait_try++;
 
-               if (arp_wait_try >= ARP_TIMEOUT_COUNT) {
+               if (arp_wait_try >= CONFIG_NET_RETRY_COUNT) {
                        puts("\nARP Retry count exceeded; starting again\n");
                        arp_wait_try = 0;
                        net_set_state(NETLOOP_FAIL);
@@ -125,8 +114,8 @@ 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;
+       uchar *tx_packet;
 
        /*
         * We have to deal with two types of ARP packets:
@@ -163,9 +152,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);
@@ -185,21 +172,22 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
                    (net_read_ip(&arp->ar_spa).s_addr & net_netmask.s_addr))
                        udelay(5000);
 #endif
-               net_send_packet((uchar *)et, eth_hdr_size + ARP_HDR_SIZE);
+               tx_packet = net_get_async_tx_pkt_buf();
+               memcpy(tx_packet, et, eth_hdr_size + ARP_HDR_SIZE);
+               net_send_packet(tx_packet, eth_hdr_size + ARP_HDR_SIZE);
                return;
 
        case ARPOP_REPLY:               /* arp reply */
-               /* are we waiting for a reply */
-               if (!net_arp_wait_packet_ip.s_addr)
+               /* are we waiting for a reply? */
+               if (!arp_is_waiting())
                        break;
 
-#ifdef CONFIG_KEEP_SERVERADDR
-               if (net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) {
+               if (IS_ENABLED(CONFIG_KEEP_SERVERADDR) &&
+                   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
 
                reply_ip_addr = net_read_ip(&arp->ar_spa);
 
@@ -235,3 +223,8 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
                return;
        }
 }
+
+bool arp_is_waiting(void)
+{
+       return !!net_arp_wait_packet_ip.s_addr;
+}