diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2010-08-01 23:00:31 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2010-10-11 22:47:48 -0700 |
| commit | 68e1ede88a5d6a43beb425d8aa4ac97b850b5720 (patch) | |
| tree | 30878d83cfc48bb2f5f5eb7b4a38893c12b7d523 | |
| parent | b0a75d7aa325181d5837f0178e1fa8417ea747c2 (diff) | |
Net: Remove redundant CONFIG_NET_MULTI directives
All are within an #ifdef CONFIG_NET_MULTI block already
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| -rw-r--r-- | net/eth.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/net/eth.c b/net/eth.c index 993306f0a47..5c70d4f3ff3 100644 --- a/net/eth.c +++ b/net/eth.c @@ -263,7 +263,6 @@ int eth_initialize(bd_t *bis) dev = dev->next; } while(dev != eth_devices); -#ifdef CONFIG_NET_MULTI /* update current ethernet name */ if (eth_current) { char *act = getenv("ethact"); @@ -271,7 +270,6 @@ int eth_initialize(bd_t *bis) setenv("ethact", eth_current->name); } else setenv("ethact", NULL); -#endif putc ('\n'); } @@ -441,7 +439,7 @@ int eth_receive(volatile void *packet, int length) void eth_try_another(int first_restart) { static struct eth_device *first_failed = NULL; - char *ethrotate; + char *ethrotate, *act; /* * Do not rotate between network interfaces when @@ -460,21 +458,16 @@ void eth_try_another(int first_restart) eth_current = eth_current->next; -#ifdef CONFIG_NET_MULTI /* update current ethernet name */ - { - char *act = getenv("ethact"); - if (act == NULL || strcmp(act, eth_current->name) != 0) - setenv("ethact", eth_current->name); - } -#endif + act = getenv("ethact"); + if (act == NULL || strcmp(act, eth_current->name) != 0) + setenv("ethact", eth_current->name); if (first_failed == eth_current) { NetRestartWrap = 1; } } -#ifdef CONFIG_NET_MULTI void eth_set_current(void) { static char *act = NULL; @@ -501,7 +494,6 @@ void eth_set_current(void) setenv("ethact", eth_current->name); } -#endif char *eth_get_name (void) { |