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: Add support for Marvell 88E1510 PHY
[oweals/u-boot.git]
/
drivers
/
net
/
bcm-sf2-eth.c
diff --git
a/drivers/net/bcm-sf2-eth.c
b/drivers/net/bcm-sf2-eth.c
index 5252d49de9568b33669426f84bb386b6b520c337..eab4c1f9003258d3926318d69b60f8c061e53c76 100644
(file)
--- a/
drivers/net/bcm-sf2-eth.c
+++ b/
drivers/net/bcm-sf2-eth.c
@@
-103,7
+103,7
@@
static int bcm_sf2_eth_send(struct eth_device *dev, void *packet, int length)
static int bcm_sf2_eth_receive(struct eth_device *dev)
{
struct eth_dma *dma = &(((struct eth_info *)(dev->priv))->dma);
static int bcm_sf2_eth_receive(struct eth_device *dev)
{
struct eth_dma *dma = &(((struct eth_info *)(dev->priv))->dma);
- uint8_t *buf = (uint8_t *)
NetRxP
ackets[0];
+ uint8_t *buf = (uint8_t *)
net_rx_p
ackets[0];
int rcvlen;
int rc = 0;
int i = 0;
int rcvlen;
int rc = 0;
int i = 0;
@@
-124,11
+124,11
@@
static int bcm_sf2_eth_receive(struct eth_device *dev)
debug("recieved\n");
/* Forward received packet to uboot network handler */
debug("recieved\n");
/* Forward received packet to uboot network handler */
-
NetReceive
(buf, rcvlen);
+
net_process_received_packet
(buf, rcvlen);
if (++i >= PKTBUFSRX)
i = 0;
if (++i >= PKTBUFSRX)
i = 0;
- buf =
NetRxP
ackets[i];
+ buf =
net_rx_p
ackets[i];
}
}
}
}
@@
-154,12
+154,6
@@
static int bcm_sf2_eth_open(struct eth_device *dev, bd_t *bt)
debug("Enabling BCM SF2 Ethernet.\n");
debug("Enabling BCM SF2 Ethernet.\n");
- /* Set MAC address from env */
- if (bcm_sf2_eth_write_hwaddr(dev) != 0) {
- error("%s: MAC set error when opening !\n", __func__);
- return -1;
- }
-
eth->enable_mac();
/* enable tx and rx DMA */
eth->enable_mac();
/* enable tx and rx DMA */