leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-net

Browse Source
This commit is contained in:
Wolfgang Denk 2009-04-24 13:36:08 +02:00
commit 4277f4de06
2 changed files with 5 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/netdev.h
View File

@ -108,7 +108,7 @@ static inline int pci_eth_init(bd_t *bis)
#if defined(CONFIG_RTL8169) #if defined(CONFIG_RTL8169)
num += rtl8169_initialize(bis); num += rtl8169_initialize(bis);
#endif #endif
#if defined(CONFIG_ULI526) #if defined(CONFIG_ULI526X)
num += uli526x_initialize(bis); num += uli526x_initialize(bis);
#endif #endif

63
net/net.c
View File

@ -285,68 +285,16 @@ NetInitLoop(proto_t protocol)
int env_id = get_env_id (); int env_id = get_env_id ();
/* update only when the environment has changed */ /* update only when the environment has changed */
if (env_changed_id == env_id) if (env_changed_id != env_id) {
return 0;
switch (protocol) {
#if defined(CONFIG_CMD_NFS)
case NFS:
#endif
#if defined(CONFIG_CMD_PING)
case PING:
#endif
#if defined(CONFIG_CMD_SNTP)
case SNTP:
#endif
case NETCONS:
case TFTP:
NetCopyIP(&NetOurIP, &bd->bi_ip_addr); NetCopyIP(&NetOurIP, &bd->bi_ip_addr);
NetOurGatewayIP = getenv_IPaddr ("gatewayip"); NetOurGatewayIP = getenv_IPaddr ("gatewayip");
NetOurSubnetMask= getenv_IPaddr ("netmask"); NetOurSubnetMask= getenv_IPaddr ("netmask");
NetOurVLAN = getenv_VLAN("vlan");
NetOurNativeVLAN = getenv_VLAN("nvlan");
switch (protocol) {
#if defined(CONFIG_CMD_NFS)
case NFS:
#endif
case NETCONS:
case TFTP:
NetServerIP = getenv_IPaddr ("serverip");
break;
#if defined(CONFIG_CMD_PING)
case PING:
/* nothing */
break;
#endif
#if defined(CONFIG_CMD_SNTP)
case SNTP:
/* nothing */
break;
#endif
default:
break;
}
break;
case BOOTP:
case RARP:
/*
* initialize our IP addr to 0 in order to accept ANY
* IP addr assigned to us by the BOOTP / RARP server
*/
NetOurIP = 0;
NetServerIP = getenv_IPaddr ("serverip"); NetServerIP = getenv_IPaddr ("serverip");
NetOurVLAN = getenv_VLAN("vlan"); /* VLANs must be read */
NetOurNativeVLAN = getenv_VLAN("nvlan"); NetOurNativeVLAN = getenv_VLAN("nvlan");
case CDP: NetOurVLAN = getenv_VLAN("vlan");
NetOurVLAN = getenv_VLAN("vlan"); /* VLANs must be read */ env_changed_id = env_id;
NetOurNativeVLAN = getenv_VLAN("nvlan");
break;
default:
break;
} }
env_changed_id = env_id;
return 0; return 0;
} }
@ -440,10 +388,7 @@ restart:
#if defined(CONFIG_CMD_DHCP) #if defined(CONFIG_CMD_DHCP)
case DHCP: case DHCP:
/* Start with a clean slate... */
BootpTry = 0; BootpTry = 0;
NetOurIP = 0;
NetServerIP = getenv_IPaddr ("serverip");
DhcpRequest(); /* Basically same as BOOTP */ DhcpRequest(); /* Basically same as BOOTP */
break; break;
#endif #endif