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 ../u-boot
[oweals/u-boot.git]
/
drivers
/
e1000.c
diff --git
a/drivers/e1000.c
b/drivers/e1000.c
index 787134abf91f039eb8692810647cd84373eb409b..f0741da82b29b49bc054b0d8b34a4798bc6131e4 100644
(file)
--- a/
drivers/e1000.c
+++ b/
drivers/e1000.c
@@
-44,8
+44,8
@@
tested on both gig copper and gig fiber boards
#include "e1000.h"
#include "e1000.h"
-#if
(CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) &&
\
- defined(CONFIG_E1000)
+#if
defined(CONFIG_CMD_NET)
\
+
&& defined(CONFIG_NET_MULTI) &&
defined(CONFIG_E1000)
#define TOUT_LOOP 100000
#define TOUT_LOOP 100000
@@
-2822,7
+2822,7
@@
e1000_poll(struct eth_device *nic)
if (!(le32_to_cpu(rd->status)) & E1000_RXD_STAT_DD)
return 0;
/*DEBUGOUT("recv: packet len=%d \n", rd->length); */
if (!(le32_to_cpu(rd->status)) & E1000_RXD_STAT_DD)
return 0;
/*DEBUGOUT("recv: packet len=%d \n", rd->length); */
- NetReceive(packet, le32_to_cpu(rd->length));
+ NetReceive(
(uchar *)
packet, le32_to_cpu(rd->length));
fill_rx(hw);
return 1;
}
fill_rx(hw);
return 1;
}