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 ffb8ea01dcc43d0de421ad2569991b42f328467e..3c41cec3e4d30f8b28d71a7f077a61232e302972 100644
(file)
--- a/
drivers/net/dm9000x.c
+++ b/
drivers/net/dm9000x.c
@@
-17,7
+17,7
@@
V0.11 06/20/2001 REG_0A bit3=1, default enable BP with DA match
R17 = (R17 & 0xfff0) | NF
v1.00 modify by simon 2001.9.5
R17 = (R17 & 0xfff0) | NF
v1.00 modify by simon 2001.9.5
- change for kernel 2.4.x
+ change for kernel 2.4.x
v1.1 11/09/2001 fix force mode bug
v1.1 11/09/2001 fix force mode bug
@@
-342,6
+342,9
@@
static int dm9000_init(struct eth_device *dev, bd_t *bd)
DM9000_iow(DM9000_ISR, ISR_ROOS | ISR_ROS | ISR_PTS | ISR_PRS);
printf("MAC: %pM\n", dev->enetaddr);
DM9000_iow(DM9000_ISR, ISR_ROOS | ISR_ROS | ISR_PTS | ISR_PRS);
printf("MAC: %pM\n", dev->enetaddr);
+ if (!is_valid_ethaddr(dev->enetaddr)) {
+ printf("WARNING: Bad MAC address (uninitialized EEPROM?)\n");
+ }
/* fill device MAC address registers */
for (i = 0, oft = DM9000_PAR; i < 6; i++, oft++)
/* fill device MAC address registers */
for (i = 0, oft = DM9000_PAR; i < 6; i++, oft++)
@@
-455,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;
@@
-516,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;