projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: phy: delay only if reset handler is registered
[oweals/u-boot.git]
/
drivers
/
net
/
rtl8139.c
diff --git
a/drivers/net/rtl8139.c
b/drivers/net/rtl8139.c
index 4186699ff987a4158100ba486c7f2f100dd26a7a..ea523435f0759ec24252ad509986dcdeb2a47ce8 100644
(file)
--- a/
drivers/net/rtl8139.c
+++ b/
drivers/net/rtl8139.c
@@
-188,7
+188,7
@@
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_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, u8 set)
{
return (0);
}
{
return (0);
}
@@
-504,11
+504,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);
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 {
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);
debug_cond(DEBUG_RX, "rx packet %d bytes", rx_size-4);
}
flush_cache((unsigned long)rx_ring, RX_BUF_LEN);