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

Net: Remove redundant CONFIG_NET_MULTI directives

Browse Source 
All are within an #ifdef CONFIG_NET_MULTI block already

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Ben Warren 2010-08-01 23:00:31 -07:00
parent b0a75d7aa3
commit 68e1ede88a
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/eth.c
View File

@ -263,7 +263,6 @@ int eth_initialize(bd_t *bis)
dev = dev->next; dev = dev->next;
} while(dev != eth_devices); } while(dev != eth_devices);
#ifdef CONFIG_NET_MULTI
/* update current ethernet name */ /* update current ethernet name */
if (eth_current) { if (eth_current) {
char *act = getenv("ethact"); char *act = getenv("ethact");
@ -271,7 +270,6 @@ int eth_initialize(bd_t *bis)
setenv("ethact", eth_current->name); setenv("ethact", eth_current->name);
} else } else
setenv("ethact", NULL); setenv("ethact", NULL);
#endif
putc ('\n'); putc ('\n');
} }
@ -441,7 +439,7 @@ int eth_receive(volatile void *packet, int length)
void eth_try_another(int first_restart) void eth_try_another(int first_restart)
{ {
static struct eth_device *first_failed = NULL; static struct eth_device *first_failed = NULL;
char *ethrotate; char *ethrotate, *act;
/* /*
* Do not rotate between network interfaces when * Do not rotate between network interfaces when
@ -460,21 +458,16 @@ void eth_try_another(int first_restart)
eth_current = eth_current->next; eth_current = eth_current->next;
#ifdef CONFIG_NET_MULTI
/* update current ethernet name */ /* update current ethernet name */
{ act = getenv("ethact");
char *act = getenv("ethact"); if (act == NULL || strcmp(act, eth_current->name) != 0)
if (act == NULL || strcmp(act, eth_current->name) != 0) setenv("ethact", eth_current->name);
setenv("ethact", eth_current->name);
}
#endif
if (first_failed == eth_current) { if (first_failed == eth_current) {
NetRestartWrap = 1; NetRestartWrap = 1;
} }
} }
#ifdef CONFIG_NET_MULTI
void eth_set_current(void) void eth_set_current(void)
{ {
static char *act = NULL; static char *act = NULL;
@ -501,7 +494,6 @@ void eth_set_current(void)
setenv("ethact", eth_current->name); setenv("ethact", eth_current->name);
} }
#endif
char *eth_get_name (void) char *eth_get_name (void)
{ {