sandbox: dts: Add display and keyboard to sandbox

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

diff --git a/net/arp.c b/net/arp.c
index 0b0ccbb58af4d919dea8e9af1a158d80ad957dfb..20c6b2d42ac0f6d90804de2d2e59fd0271da663b 100644 (file)
--- a/net/arp.c
+++ b/net/arp.c
@@ -27,15 +27,15 @@
 #endif
 
 IPaddr_t       NetArpWaitPacketIP;
-IPaddr_t       NetArpWaitReplyIP;
+static IPaddr_t        NetArpWaitReplyIP;
 /* MAC address of waiting packet's destination */
 uchar         *NetArpWaitPacketMAC;
 int            NetArpWaitTxPacketSize;
 ulong          NetArpWaitTimerStart;
 int            NetArpWaitTry;
 
-uchar         *NetArpTxPacket; /* THE ARP transmit packet */
-uchar          NetArpPacketBuf[PKTSIZE_ALIGN + PKTALIGN];
+static uchar   *NetArpTxPacket;        /* THE ARP transmit packet */
+static uchar   NetArpPacketBuf[PKTSIZE_ALIGN + PKTALIGN];
 
 void ArpInit(void)
 {
@@ -55,7 +55,7 @@ void arp_raw_request(IPaddr_t sourceIP, const uchar *targetEther,
        struct arp_hdr *arp;
        int eth_hdr_size;
 
-       debug("ARP broadcast %d\n", NetArpWaitTry);
+       debug_cond(DEBUG_DEV_PKT, "ARP broadcast %d\n", NetArpWaitTry);
 
        pkt = NetArpTxPacket;
 
@@ -135,7 +135,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
         *   address; so if we receive such a packet, we set
         *   the server ethernet address
         */
-       debug("Got ARP\n");
+       debug_cond(DEBUG_NET_PKT, "Got ARP\n");
 
        arp = (struct arp_hdr *)ip;
        if (len < ARP_HDR_SIZE) {
@@ -160,7 +160,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
        switch (ntohs(arp->ar_op)) {
        case ARPOP_REQUEST:
                /* reply with our IP address */
-               debug("Got ARP REQUEST, return our IP\n");
+               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;
@@ -194,7 +194,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
 #ifdef CONFIG_KEEP_SERVERADDR
                if (NetServerIP == NetArpWaitPacketIP) {
                        char buf[20];
-                       sprintf(buf, "%pM", arp->ar_sha);
+                       sprintf(buf, "%pM", &arp->ar_sha);
                        setenv("serveraddr", buf);
                }
 #endif
@@ -203,7 +203,8 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
 
                /* matched waiting packet's address */
                if (reply_ip_addr == NetArpWaitReplyIP) {
-                       debug("Got ARP REPLY, set eth addr (%pM)\n",
+                       debug_cond(DEBUG_DEV_PKT,
+                               "Got ARP REPLY, set eth addr (%pM)\n",
                                arp->ar_data);
 
                        /* save address for later use */