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-w32-f47ce07b2699134d94dae9320dabc4a91c3c6b83.tar.gz busybox-w32-f47ce07b2699134d94dae9320dabc4a91c3c6b83.tar.bz2 busybox-w32-f47ce07b2699134d94dae9320dabc4a91c3c6b83.zip |
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 | |||
82 | This adds about 600 bytes. | 82 | This adds about 600 bytes. |
83 | 83 | ||
84 | config FEATURE_BRCTL_SHOW | 84 | config FEATURE_BRCTL_SHOW |
85 | bool "Support show, showmac and showstp" | 85 | bool "Support show" |
86 | default y | 86 | default y |
87 | depends on BRCTL && FEATURE_BRCTL_FANCY | 87 | depends on BRCTL && FEATURE_BRCTL_FANCY |
88 | help | 88 | help |
89 | Add support for option which prints the current config: | 89 | Add support for option which prints the current config: |
90 | showmacs, showstp, show | 90 | show |
91 | 91 | ||
92 | config DNSD | 92 | config DNSD |
93 | bool "dnsd" | 93 | 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) | |||
129 | "setageing\0" "setfd\0" "sethello\0" "setmaxage\0" | 129 | "setageing\0" "setfd\0" "sethello\0" "setmaxage\0" |
130 | "setpathcost\0" "setportprio\0" "setbridgeprio\0" | 130 | "setpathcost\0" "setportprio\0" "setbridgeprio\0" |
131 | ) | 131 | ) |
132 | IF_FEATURE_BRCTL_SHOW("showmacs\0" "show\0"); | 132 | IF_FEATURE_BRCTL_SHOW("show\0"); |
133 | 133 | ||
134 | enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif | 134 | enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif |
135 | IF_FEATURE_BRCTL_FANCY(, | 135 | IF_FEATURE_BRCTL_FANCY(, |
@@ -137,7 +137,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv) | |||
137 | ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage, | 137 | ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage, |
138 | ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio | 138 | ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio |
139 | ) | 139 | ) |
140 | IF_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show) | 140 | IF_FEATURE_BRCTL_SHOW(, ARG_show) |
141 | }; | 141 | }; |
142 | 142 | ||
143 | int fd; | 143 | int fd; |