efikamx: Fix CONFIG_SYS_MEMTEST_END

[u-boot] / net / net.c

diff --git a/net/net.c b/net/net.c
index 8f55281f406dc0bf97e71b66b990795db353d7cc..c5acf8ff6e1cbf2612378a1ccdad03a0d31907a3 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -402,6 +402,7 @@ int NetLoop(enum proto_t protocol)
                NetArpWaitTxPacketSize = 0;
        }
 
+       bootstage_mark_name(BOOTSTAGE_ID_ETH_START, "eth_start");
        eth_halt();
        eth_set_current();
        if (eth_init(bd) < 0) {
@@ -728,7 +729,7 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len)
         */
        if (memcmp(ether, NetEtherNullAddr, 6) == 0) {
 
-               debug("sending ARP for %08lx\n", dest);
+               debug("sending ARP for %08x\n", dest);
 
                NetArpWaitPacketIP = dest;
                NetArpWaitPacketMAC = ether;
@@ -751,7 +752,7 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len)
                return 1;       /* waiting */
        }
 
-       debug("sending UDP to %08lx/%pM\n", dest, ether);
+       debug("sending UDP to %08x/%pM\n", dest, ether);
 
        pkt = (uchar *)NetTxPacket;
        pkt += NetSetEther(pkt, ether, PROT_IP);
@@ -775,7 +776,7 @@ int PingSend(void)
 
        memcpy(mac, NetEtherNullAddr, 6);
 
-       debug("sending ARP for %08lx\n", NetPingIP);
+       debug("sending ARP for %08x\n", NetPingIP);
 
        NetArpWaitPacketIP = NetPingIP;
        NetArpWaitPacketMAC = mac;
@@ -1080,7 +1081,6 @@ CDPHandler(const uchar *pkt, unsigned len)
        const uchar *t;
        const ushort *ss;
        ushort type, tlen;
-       uchar applid;
        ushort vlan, nvlan;
 
        /* minimum size? */
@@ -1152,11 +1152,10 @@ CDPHandler(const uchar *pkt, unsigned len)
                                if (tlen < 3)
                                        goto pkt_short;
 
-                               applid = t[0];
                                ss = (const ushort *)(t + 1);
 
 #ifdef CONFIG_CDP_APPLIANCE_VLAN_TYPE
-                               if (applid == CONFIG_CDP_APPLIANCE_VLAN_TYPE)
+                               if (t[0] == CONFIG_CDP_APPLIANCE_VLAN_TYPE)
                                        vlan = *ss;
 #else
                                /* XXX will this work; dunno */