Merge branch 'master' of git://git.denx.de/u-boot-arm into master

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

diff --git a/net/cdp.c b/net/cdp.c
index 004aae2ff2ab82fb1281289c99966be6ee8f641e..3d9559eb3b66b67c3214b1f65165e42ae3dc1062 100644 (file)
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -109,7 +109,7 @@ CDPSendTrigger(void)
        uchar *pkt;
        ushort *s;
        ushort *cp;
-       Ethernet_t *et;
+       struct ethernet_hdr *et;
        int len;
        ushort chksum;
 #if    defined(CONFIG_CDP_DEVICE_ID) || defined(CONFIG_CDP_PORT_ID)   || \
@@ -118,7 +118,7 @@ CDPSendTrigger(void)
 #endif
 
        pkt = NetTxPacket;
-       et = (Ethernet_t *)pkt;
+       et = (struct ethernet_hdr *)pkt;
 
        /* NOTE: trigger sent not on any VLAN */
 
@@ -216,7 +216,7 @@ CDPSendTrigger(void)
                chksum = 0xFFFF;
        *cp = htons(chksum);
 
-       (void) eth_send(NetTxPacket, (uchar *)s - NetTxPacket);
+       NetSendPacket(NetTxPacket, (uchar *)s - NetTxPacket);
        return 0;
 }
 
@@ -235,18 +235,10 @@ CDPTimeout(void)
        if (!CDPOK)
                NetStartAgain();
        else
-               NetState = NETLOOP_SUCCESS;
+               net_set_state(NETLOOP_SUCCESS);
 }
 
-static void
-CDPDummyHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
-               unsigned len)
-{
-       /* nothing */
-}
-
-void
-CDPHandler(const uchar *pkt, unsigned len)
+void cdp_receive(const uchar *pkt, unsigned len)
 {
        const uchar *t;
        const ushort *ss;
@@ -369,7 +361,6 @@ CDPStart(void)
        CDPApplianceVLAN = htons(-1);
 
        NetSetTimeout(CDP_TIMEOUT, CDPTimeout);
-       NetSetHandler(CDPDummyHandler);
 
        CDPSendTrigger();
 }