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
/
dm9000x.c
diff --git
a/drivers/net/dm9000x.c
b/drivers/net/dm9000x.c
index d1c6f4ca2e0663a9e69213ed73cba8d7009a3d3f..3c41cec3e4d30f8b28d71a7f077a61232e302972 100644
(file)
--- a/
drivers/net/dm9000x.c
+++ b/
drivers/net/dm9000x.c
@@
-343,13
+343,7
@@
static int dm9000_init(struct eth_device *dev, bd_t *bd)
printf("MAC: %pM\n", dev->enetaddr);
if (!is_valid_ethaddr(dev->enetaddr)) {
printf("MAC: %pM\n", dev->enetaddr);
if (!is_valid_ethaddr(dev->enetaddr)) {
-#ifdef CONFIG_RANDOM_MACADDR
- printf("Bad MAC address (uninitialized EEPROM?), randomizing\n");
- net_random_ethaddr(dev->enetaddr);
- printf("MAC: %pM\n", dev->enetaddr);
-#else
printf("WARNING: Bad MAC address (uninitialized EEPROM?)\n");
printf("WARNING: Bad MAC address (uninitialized EEPROM?)\n");
-#endif
}
/* fill device MAC address registers */
}
/* fill device MAC address registers */
@@
-464,7
+458,8
@@
static void dm9000_halt(struct eth_device *netdev)
*/
static int dm9000_rx(struct eth_device *netdev)
{
*/
static int dm9000_rx(struct eth_device *netdev)
{
- u8 rxbyte, *rdptr = (u8 *) NetRxPackets[0];
+ u8 rxbyte;
+ u8 *rdptr = (u8 *)net_rx_packets[0];
u16 RxStatus, RxLen = 0;
struct board_info *db = &dm9000_info;
u16 RxStatus, RxLen = 0;
struct board_info *db = &dm9000_info;
@@
-525,7
+520,7
@@
static int dm9000_rx(struct eth_device *netdev)
DM9000_DMP_PACKET(__func__ , rdptr, RxLen);
DM9000_DBG("passing packet to upper layer\n");
DM9000_DMP_PACKET(__func__ , rdptr, RxLen);
DM9000_DBG("passing packet to upper layer\n");
-
NetReceive(NetRxP
ackets[0], RxLen);
+
net_process_received_packet(net_rx_p
ackets[0], RxLen);
}
}
return 0;
}
}
return 0;