arm64: zynqmp: Point zcu216 defconfig to correct dts file

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

diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index e3feef849c33ce7b97d7f9680fc19e40dfe79377..bb59629f81cb737f13520ad9708f8f58c7aca37e 100644 (file)
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -72,6 +72,7 @@
 */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
@@ -80,10 +81,6 @@
 
 #define RTL_TIMEOUT    100000
 
-#define ETH_FRAME_LEN          1514
-#define ETH_ALEN               6
-#define ETH_ZLEN               60
-
 /* PCI Tuning Parameters
    Threshold is bytes transferred to chip before transmission starts. */
 #define TX_FIFO_THRESH 256     /* In bytes, rounded down to 32 byte units. */
@@ -184,15 +181,13 @@ static unsigned char rx_ring[RX_BUF_LEN+16] __attribute__((aligned(4)));
 static int rtl8139_probe(struct eth_device *dev, bd_t *bis);
 static int read_eeprom(int location, int addr_len);
 static void rtl_reset(struct eth_device *dev);
-static int rtl_transmit(struct eth_device *dev, volatile void *packet, int length);
+static int rtl_transmit(struct eth_device *dev, void *packet, int length);
 static int rtl_poll(struct eth_device *dev);
 static void rtl_disable(struct eth_device *dev);
-#ifdef CONFIG_MCAST_TFTP/*  This driver already accepts all b/mcast */
-static int rtl_bcast_addr (struct eth_device *dev, u8 bcast_mac, u8 set)
+static int rtl_bcast_addr(struct eth_device *dev, const u8 *bcast_mac, int join)
 {
        return (0);
 }
-#endif
 
 static struct pci_device_id supported[] = {
        {PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139},
@@ -233,9 +228,7 @@ int rtl8139_initialize(bd_t *bis)
                dev->halt = rtl_disable;
                dev->send = rtl_transmit;
                dev->recv = rtl_poll;
-#ifdef CONFIG_MCAST_TFTP
                dev->mcast = rtl_bcast_addr;
-#endif
 
                eth_register (dev);
 
@@ -407,7 +400,7 @@ static void rtl_reset(struct eth_device *dev)
        outw(0, ioaddr + IntrMask);
 }
 
-static int rtl_transmit(struct eth_device *dev, volatile void *packet, int length)
+static int rtl_transmit(struct eth_device *dev, void *packet, int length)
 {
        unsigned int status;
        unsigned long txstatus;
@@ -504,11 +497,11 @@ static int rtl_poll(struct eth_device *dev)
                memcpy(rxdata, rx_ring + ring_offs + 4, semi_count);
                memcpy(&(rxdata[semi_count]), rx_ring, rx_size-4-semi_count);
 
-               NetReceive(rxdata, length);
+               net_process_received_packet(rxdata, length);
                debug_cond(DEBUG_RX, "rx packet %d+%d bytes",
                        semi_count, rx_size-4-semi_count);
        } else {
-               NetReceive(rx_ring + ring_offs + 4, length);
+               net_process_received_packet(rx_ring + ring_offs + 4, length);
                debug_cond(DEBUG_RX, "rx packet %d bytes", rx_size-4);
        }
        flush_cache((unsigned long)rx_ring, RX_BUF_LEN);