diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 4 | ||||
| -rw-r--r-- | net/eth.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/bootp.c b/net/bootp.c index f6d08a7e76..4be0ad586a 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -55,7 +55,7 @@ ulong seed1, seed2; #if (CONFIG_COMMANDS & CFG_CMD_DHCP) dhcp_state_t dhcp_state = INIT; -unsigned int dhcp_leasetime = 0; +unsigned long dhcp_leasetime = 0; IPaddr_t NetDHCPServerIP = 0; static void DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len); @@ -712,7 +712,7 @@ static void DhcpOptionsProcess(uchar *popt) NetOurRootPath[size] = 0 ; break; case 51: - dhcp_leasetime = *(unsigned int *)(popt + 2); + NetCopyLong (&dhcp_leasetime, (ulong *)(popt + 2)); break; case 53: /* Ignore Message Type Option */ break; @@ -31,6 +31,7 @@ extern int gt6426x_eth_initialize(bd_t *bis); #endif +extern int e1000_initialize(bd_t*); extern int eepro100_initialize(bd_t*); extern int natsemi_initialize(bd_t*); extern int ns8382x_initialize(bd_t*); @@ -103,6 +104,9 @@ int eth_initialize(bd_t *bis) #ifdef CONFIG_PLB2800_ETHER plb2800_eth_initialize(bis); #endif +#ifdef CONFIG_E1000 + e1000_initialize(bis); +#endif #ifdef CONFIG_EEPRO100 eepro100_initialize(bis); #endif |
