net: cosmetic: Fixup var names for DHCP strings

[karo-tx-uboot.git] / net / rarp.c

diff --git a/net/rarp.c b/net/rarp.c
index a715c2c7fd6420d5c157fce073ede337adb2c582..3e1c74cdcc5ee90a433fe9858529e2e7e8849b16 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000-2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -45,7 +29,7 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len)
 {
        struct arp_hdr *arp;
 
-       debug("Got RARP\n");
+       debug_cond(DEBUG_NET_PKT, "Got RARP\n");
        arp = (struct arp_hdr *)ip;
        if (len < ARP_HDR_SIZE) {
                printf("bad length %d < %d\n", len, ARP_HDR_SIZE);
@@ -59,11 +43,11 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len)
 
                puts("invalid RARP header\n");
        } else {
-               NetCopyIP(&NetOurIP, &arp->ar_data[16]);
-               if (NetServerIP == 0)
-                       NetCopyIP(&NetServerIP, &arp->ar_data[6]);
+               net_copy_ip(&net_ip, &arp->ar_data[16]);
+               if (net_server_ip.s_addr == 0)
+                       net_copy_ip(&net_server_ip, &arp->ar_data[6]);
                memcpy(NetServerEther, &arp->ar_data[0], 6);
-               debug("Got good RARP\n");
+               debug_cond(DEBUG_DEV_PKT, "Got good RARP\n");
                net_auto_load();
        }
 }
@@ -104,7 +88,7 @@ void RarpRequest(void)
        rarp->ar_pln = 4;
        rarp->ar_op  = htons(RARPOP_REQUEST);
        memcpy(&rarp->ar_data[0],  NetOurEther, 6);     /* source ET addr */
-       memcpy(&rarp->ar_data[6],  &NetOurIP,   4);     /* source IP addr */
+       memcpy(&rarp->ar_data[6],  &net_ip,   4);       /* source IP addr */
        /* dest ET addr = source ET addr ??*/
        memcpy(&rarp->ar_data[10], NetOurEther, 6);
        /* dest IP addr set to broadcast */