Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

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

diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index de517f8dab9493f2a8492a8aa8ecc59d3d50b1ab..ad3bd1e2124059f7da1fed4f37859f7ec6e7f69e 100644 (file)
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -182,12 +182,10 @@ static int alt_sgdma_do_sync_transfer(volatile struct alt_sgdma_registers *dev,
 static int alt_sgdma_do_async_transfer(volatile struct alt_sgdma_registers *dev,
                                volatile struct alt_sgdma_descriptor *desc)
 {
-       unsigned int status;
        int counter = 0;
 
        /* Wait for any pending transfers to complete */
        alt_sgdma_print_desc(desc);
-       status = dev->status;
 
        counter = 0;
        while (dev->status & ALT_SGDMA_STATUS_BUSY_MSK) {
@@ -303,16 +301,17 @@ static int tse_eth_rx(struct eth_device *dev)
            ALT_SGDMA_DESCRIPTOR_STATUS_TERMINATED_BY_EOP_MSK) {
                debug("got packet\n");
                packet_length = rx_desc->actual_bytes_transferred;
-               NetReceive(NetRxPackets[0], packet_length);
+               net_process_received_packet(net_rx_packets[0], packet_length);
 
                /* start descriptor again */
-               flush_dcache_range((unsigned long)(NetRxPackets[0]),
-                       (unsigned long)(NetRxPackets[0]) + PKTSIZE_ALIGN);
+               flush_dcache_range((unsigned long)(net_rx_packets[0]),
+                                  (unsigned long)(net_rx_packets[0] +
+                                                  PKTSIZE_ALIGN));
                alt_sgdma_construct_descriptor_burst(
                        (volatile struct alt_sgdma_descriptor *)&rx_desc[0],
                        (volatile struct alt_sgdma_descriptor *)&rx_desc[1],
                        (unsigned int)0x0,      /* read addr */
-                       (unsigned int *)NetRxPackets[0],
+                       (unsigned int *)net_rx_packets[0],
                        0x0,    /* length or EOP */
                        0x0,    /* gen eop */
                        0x0,    /* read fixed */
@@ -835,13 +834,13 @@ static int tse_eth_init(struct eth_device *dev, bd_t * bd)
                0x0     /* channel */
                );
        debug("Configuring rx desc\n");
-       flush_dcache_range((unsigned long)(NetRxPackets[0]),
-                       (unsigned long)(NetRxPackets[0]) + PKTSIZE_ALIGN);
+       flush_dcache_range((unsigned long)(net_rx_packets[0]),
+                          (unsigned long)(net_rx_packets[0]) + PKTSIZE_ALIGN);
        alt_sgdma_construct_descriptor_burst(
                (volatile struct alt_sgdma_descriptor *)&rx_desc[0],
                (volatile struct alt_sgdma_descriptor *)&rx_desc[1],
                (unsigned int)0x0,      /* read addr */
-               (unsigned int *)NetRxPackets[0],
+               (unsigned int *)net_rx_packets[0],
                0x0,    /* length or EOP */
                0x0,    /* gen eop */
                0x0,    /* read fixed */