diff options
| author | Nicolas Thill <nico@openwrt.org> | 2012-09-25 14:06:01 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-09-29 16:43:33 +0200 |
| commit | f47ce07b2699134d94dae9320dabc4a91c3c6b83 (patch) | |
| tree | 0608e71428675349867c79b5d4f9a4ebb85c0a90 | |
| parent | 1c7a58dfb82ea04c525e0c19f94f2d800dee99e3 (diff) | |
| download | busybox-f47ce07b2699134d94dae9320dabc4a91c3c6b83.tar.gz | |
brctl: fix description and usage
brctl uncorrectly displays the "showmacs" command as being supported while
it is not, remove it from the usage and Config.src file.
Signed-off-by: Nicolas Thill <nico@openwrt.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/Config.src | 4 | ||||
| -rw-r--r-- | networking/brctl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/networking/Config.src b/networking/Config.src index e2376d548..e1ae0c9d5 100644 --- a/networking/Config.src +++ b/networking/Config.src @@ -82,12 +82,12 @@ config FEATURE_BRCTL_FANCY This adds about 600 bytes. config FEATURE_BRCTL_SHOW - bool "Support show, showmac and showstp" + bool "Support show" default y depends on BRCTL && FEATURE_BRCTL_FANCY help Add support for option which prints the current config: - showmacs, showstp, show + show config DNSD bool "dnsd" diff --git a/networking/brctl.c b/networking/brctl.c index 7289e641f..b4f5809df 100644 --- a/networking/brctl.c +++ b/networking/brctl.c @@ -129,7 +129,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv) "setageing\0" "setfd\0" "sethello\0" "setmaxage\0" "setpathcost\0" "setportprio\0" "setbridgeprio\0" ) - IF_FEATURE_BRCTL_SHOW("showmacs\0" "show\0"); + IF_FEATURE_BRCTL_SHOW("show\0"); enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif IF_FEATURE_BRCTL_FANCY(, @@ -137,7 +137,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv) ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage, ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio ) - IF_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show) + IF_FEATURE_BRCTL_SHOW(, ARG_show) }; int fd; |