projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
[oweals/u-boot.git]
/
drivers
/
net
/
smc911x.c
diff --git
a/drivers/net/smc911x.c
b/drivers/net/smc911x.c
index b097c1a56fb157804e7cafdd54eaa8ec04fd73cc..c85a178cd89a0ec7db1a619e49f1832f505ced94 100644
(file)
--- a/
drivers/net/smc911x.c
+++ b/
drivers/net/smc911x.c
@@
-187,11
+187,12
@@
static int smc911x_send(struct eth_device *dev, void *packet, int length)
static void smc911x_halt(struct eth_device *dev)
{
smc911x_reset(dev);
static void smc911x_halt(struct eth_device *dev)
{
smc911x_reset(dev);
+ smc911x_handle_mac_address(dev);
}
static int smc911x_rx(struct eth_device *dev)
{
}
static int smc911x_rx(struct eth_device *dev)
{
- u32 *data = (u32 *)
NetRxP
ackets[0];
+ u32 *data = (u32 *)
net_rx_p
ackets[0];
u32 pktlen, tmplen;
u32 status;
u32 pktlen, tmplen;
u32 status;
@@
-210,7
+211,7
@@
static int smc911x_rx(struct eth_device *dev)
": dropped bad packet. Status: 0x%08x\n",
status);
else
": dropped bad packet. Status: 0x%08x\n",
status);
else
-
NetReceive(NetRxP
ackets[0], pktlen);
+
net_process_received_packet(net_rx_p
ackets[0], pktlen);
}
return 0;
}
return 0;