emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

brctl: fix description and usage

Browse Source 
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>
This commit is contained in:
Nicolas Thill 2012-09-25 14:06:01 +02:00 committed by Denys Vlasenko
parent 1c7a58dfb8
commit f47ce07b26
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
networking/Config.src
View File

@ -82,12 +82,12 @@ config FEATURE_BRCTL_FANCY
This adds about 600 bytes. This adds about 600 bytes.
config FEATURE_BRCTL_SHOW config FEATURE_BRCTL_SHOW
bool "Support show, showmac and showstp" bool "Support show"
default y default y
depends on BRCTL && FEATURE_BRCTL_FANCY depends on BRCTL && FEATURE_BRCTL_FANCY
help help
Add support for option which prints the current config: Add support for option which prints the current config:
showmacs, showstp, show show
config DNSD config DNSD
bool "dnsd" bool "dnsd"

4
networking/brctl.c
View File

@ -129,7 +129,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
"setageing\0" "setfd\0" "sethello\0" "setmaxage\0" "setageing\0" "setfd\0" "sethello\0" "setmaxage\0"
"setpathcost\0" "setportprio\0" "setbridgeprio\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 enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif
IF_FEATURE_BRCTL_FANCY(, 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_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
) )
IF_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show) IF_FEATURE_BRCTL_SHOW(, ARG_show)
}; };
int fd; int fd;