flash: complete CONFIG_SYS_NO_FLASH move with renaming

[oweals/u-boot.git] / drivers / net / ftmac100.c

diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 3e148db5cda4abbfc5cf7a574902f4652cf7cba6..1fc7da9a3e71cda2cf6bc5b63d5c8c06512f9781 100644 (file)
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -102,7 +102,7 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd)
 
        for (i = 0; i < PKTBUFSRX; i++) {
                /* RXBUF_BADR */
-               rxdes[i].rxdes2 = (unsigned int)NetRxPackets[i];
+               rxdes[i].rxdes2 = (unsigned int)net_rx_packets[i];
                rxdes[i].rxdes1 |= FTMAC100_RXDES1_RXBUF_SIZE (PKTSIZE_ALIGN);
                rxdes[i].rxdes0 = FTMAC100_RXDES0_RXDMA_OWN;
        }
@@ -164,7 +164,7 @@ static int ftmac100_recv (struct eth_device *dev)
 
        /* pass the packet up to the protocol layers. */
 
-       NetReceive ((void *)curr_des->rxdes2, rxlen);
+       net_process_received_packet((void *)curr_des->rxdes2, rxlen);
 
        /* release buffer to DMA */
 
@@ -246,7 +246,7 @@ int ftmac100_initialize (bd_t *bd)
        memset (dev, 0, sizeof (*dev));
        memset (priv, 0, sizeof (*priv));
 
-       sprintf (dev->name, "FTMAC100");
+       strcpy(dev->name, "FTMAC100");
        dev->iobase     = CONFIG_FTMAC100_BASE;
        dev->init       = ftmac100_init;
        dev->halt       = ftmac100_halt;