diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-22 19:35:51 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-22 19:35:51 +0000 |
commit | d0587ed9666d2d3aa65c42007ae93244cfc58568 (patch) | |
tree | 89c559b2803b07ca13bd7d65a5669975aafb5bf8 | |
parent | cbcff2936e3ff8382c7c9c79c8674e125fdae8ae (diff) | |
download | busybox-w32-d0587ed9666d2d3aa65c42007ae93244cfc58568.tar.gz busybox-w32-d0587ed9666d2d3aa65c42007ae93244cfc58568.tar.bz2 busybox-w32-d0587ed9666d2d3aa65c42007ae93244cfc58568.zip |
interface: revert part of commit 18120 (eth aliases work again)
-rw-r--r-- | networking/interface.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/networking/interface.c b/networking/interface.c index 2c5f3284e..b1b935e7e 100644 --- a/networking/interface.c +++ b/networking/interface.c | |||
@@ -499,7 +499,6 @@ static inline int procnetdev_version(char *buf) | |||
499 | return 0; | 499 | return 0; |
500 | } | 500 | } |
501 | 501 | ||
502 | /* Used only if "/proc/net/dev" isn't available */ | ||
503 | static int if_readconf(void) | 502 | static int if_readconf(void) |
504 | { | 503 | { |
505 | int numreqs = 30; | 504 | int numreqs = 30; |
@@ -592,7 +591,11 @@ static int if_readlist_proc(char *target) | |||
592 | 591 | ||
593 | static int if_readlist(void) | 592 | static int if_readlist(void) |
594 | { | 593 | { |
595 | return if_readlist_proc(NULL); | 594 | int err = if_readlist_proc(NULL); |
595 | /* Needed in order to get ethN:M aliases */ | ||
596 | if (!err) | ||
597 | err = if_readconf(); | ||
598 | return err; | ||
596 | } | 599 | } |
597 | 600 | ||
598 | static int for_all_interfaces(int (*doit) (struct interface *, void *), | 601 | static int for_all_interfaces(int (*doit) (struct interface *, void *), |