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 'master' of git://git.denx.de/u-boot
[oweals/u-boot.git]
/
drivers
/
net
/
fec_mxc.c
diff --git
a/drivers/net/fec_mxc.c
b/drivers/net/fec_mxc.c
index 549d6486136204ed644a2c2ecba101d25db303ef..9225d37285ff9b60dde89f2a924edbeff478a3cd 100644
(file)
--- a/
drivers/net/fec_mxc.c
+++ b/
drivers/net/fec_mxc.c
@@
-11,6
+11,7
@@
#include <common.h>
#include <malloc.h>
#include <net.h>
#include <common.h>
#include <malloc.h>
#include <net.h>
+#include <netdev.h>
#include <miiphy.h>
#include "fec_mxc.h"
#include <miiphy.h>
#include "fec_mxc.h"
@@
-179,13
+180,14
@@
static int fec_mdio_write(struct ethernet_regs *eth, uint8_t phyAddr,
return 0;
}
return 0;
}
-int fec_phy_read(struct mii_dev *bus, int phyAddr, int dev_addr, int regAddr)
+static int fec_phy_read(struct mii_dev *bus, int phyAddr, int dev_addr,
+ int regAddr)
{
return fec_mdio_read(bus->priv, phyAddr, regAddr);
}
{
return fec_mdio_read(bus->priv, phyAddr, regAddr);
}
-
int fec_phy_write(struct mii_dev *bus, int phyAddr, int dev_addr, int regA
ddr,
- u16 data)
+
static int fec_phy_write(struct mii_dev *bus, int phyAddr, int dev_a
ddr,
+
int regAddr,
u16 data)
{
return fec_mdio_write(bus->priv, phyAddr, regAddr, data);
}
{
return fec_mdio_write(bus->priv, phyAddr, regAddr, data);
}
@@
-355,7
+357,7
@@
static int fec_get_hwaddr(struct eth_device *dev, int dev_id,
unsigned char *mac)
{
imx_get_mac_from_fuse(dev_id, mac);
unsigned char *mac)
{
imx_get_mac_from_fuse(dev_id, mac);
- return !is_valid_eth
er_
addr(mac);
+ return !is_valid_ethaddr(mac);
}
static int fec_set_hwaddr(struct eth_device *dev)
}
static int fec_set_hwaddr(struct eth_device *dev)
@@
-850,7
+852,7
@@
static int fec_recv(struct eth_device *dev)
swap_packet((uint32_t *)frame->data, frame_length);
#endif
memcpy(buff, frame->data, frame_length);
swap_packet((uint32_t *)frame->data, frame_length);
#endif
memcpy(buff, frame->data, frame_length);
-
NetReceive
(buff, frame_length);
+
net_process_received_packet
(buff, frame_length);
len = frame_length;
} else {
if (bd_status & FEC_RBD_ERR)
len = frame_length;
} else {
if (bd_status & FEC_RBD_ERR)