package/busybox: add missing bits from 1.17.1 update (mostly config stuff), rename...

[openwrt.git] / package / busybox / patches / 003-brctl_show_fix.patch

diff --git a/package/busybox/patches/003-brctl_show_fix.patch b/package/busybox/patches/003-brctl_show_fix.patch
index f3fc402..d36ffc5 100644 (file)
--- a/package/busybox/patches/003-brctl_show_fix.patch
+++ b/package/busybox/patches/003-brctl_show_fix.patch
@@ -1,32 +1,32 @@
 --- a/networking/brctl.c
 +++ b/networking/brctl.c
-@@ -104,7 +104,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -105,7 +105,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
                "setageing\0" "setfd\0" "sethello\0" "setmaxage\0"
                "setpathcost\0" "setportprio\0" "setbridgeprio\0"
        )
--      USE_FEATURE_BRCTL_SHOW("showmacs\0" "show\0");
-+      USE_FEATURE_BRCTL_SHOW("show\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
-               USE_FEATURE_BRCTL_FANCY(,
-@@ -112,7 +112,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
+               IF_FEATURE_BRCTL_FANCY(,
+@@ -113,7 +113,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
                   ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
                   ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
                )
--              USE_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show)
-+              USE_FEATURE_BRCTL_SHOW(, ARG_show)
+-              IF_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show)
++              IF_FEATURE_BRCTL_SHOW(, ARG_show)
        };
  
        int fd;
---- a/networking/Config.in
-+++ b/networking/Config.in
-@@ -66,12 +66,12 @@ config FEATURE_BRCTL_FANCY
+--- a/networking/Config.src
++++ b/networking/Config.src
+@@ -79,12 +79,12 @@ config FEATURE_BRCTL_FANCY
          This adds about 600 bytes.
  
  config FEATURE_BRCTL_SHOW
 -      bool "Support show, showmac and showstp"
 +      bool "Support show"
-       default n
+       default y
        depends on BRCTL && FEATURE_BRCTL_FANCY
        help
          Add support for option which prints the current config: