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>

diff --git a/networking/Config.src b/networking/Config.src
index e2376d548a4934ee8fe43d7f13a98ac670f63347..e1ae0c9d54d642ffc3fd17d11eb61e212f5de010 100644 (file)
--- 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 7289e641f5f28159e82fe2e145cc4605b1e68c52..b4f5809dffe691ac9a5347f44ae9ea991511cbaf 100644 (file)
--- 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;