aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/802-brctl_linux24.patch
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2011-10-21 23:08:45 +0000
committerNicolas Thill <nico@openwrt.org>2011-10-21 23:08:45 +0000
commitd10b4495bcb7fa7bfdf1738097491f0ec4f75655 (patch)
tree582ab3d138a618bb22578bca4be5e1720caab80a /package/busybox/patches/802-brctl_linux24.patch
parent3fadea0d6f33da681b05f565130f2e8642371947 (diff)
downloadupstream-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.tar.gz
upstream-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.tar.bz2
upstream-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.zip
busybox: update to 1.19.2 (thanks to Peter Wagner)
SVN-Revision: 28513
Diffstat (limited to 'package/busybox/patches/802-brctl_linux24.patch')
-rw-r--r--package/busybox/patches/802-brctl_linux24.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/busybox/patches/802-brctl_linux24.patch b/package/busybox/patches/802-brctl_linux24.patch
index 09ee8be1ee..8cc19779a2 100644
--- a/package/busybox/patches/802-brctl_linux24.patch
+++ b/package/busybox/patches/802-brctl_linux24.patch
@@ -1,6 +1,6 @@
--- a/networking/brctl.c
+++ b/networking/brctl.c
-@@ -32,7 +32,7 @@
+@@ -56,7 +56,7 @@
/* Maximum number of ports supported per bridge interface. */
#ifndef MAX_PORTS
@@ -9,7 +9,7 @@
#endif
/* Use internal number parsing and not the "exact" conversion. */
-@@ -169,6 +169,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -193,6 +193,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
printf(bi.stp_enabled ? "\tyes" : "\tno");
/* print interface list */
@@ -17,7 +17,7 @@
arm_ioctl(args, BRCTL_GET_PORT_LIST,
(unsigned long) ifidx, MAX_PORTS);
xioctl(fd, SIOCDEVPRIVATE, &ifr);
-@@ -197,9 +198,19 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -221,9 +222,19 @@ int brctl_main(int argc UNUSED_PARAM, ch
br = *argv++;
if (key == ARG_addbr || key == ARG_delbr) { /* addbr or delbr */
@@ -40,7 +40,7 @@
goto done;
}
-@@ -208,14 +219,27 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -232,14 +243,27 @@ int brctl_main(int argc UNUSED_PARAM, ch
strncpy_IFNAMSIZ(ifr.ifr_name, br);
if (key == ARG_addif || key == ARG_delif) { /* addif or delif */