diff options
| author | Nicolas Thill <nico@openwrt.org> | 2009-09-28 12:38:46 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2009-09-28 12:38:46 +0000 |
| commit | 91750d01a7a0b56a880a147a825d097aaac7f53d (patch) | |
| tree | 20de5267e6400c96be022906c833acdb5f7eb6d0 /package/busybox/patches/802-brctl_linux24.patch | |
| parent | 6fa03d63d4d34ef38a5fde5292cb7f65c06d56b2 (diff) | |
| download | upstream-91750d01a7a0b56a880a147a825d097aaac7f53d.tar.gz upstream-91750d01a7a0b56a880a147a825d097aaac7f53d.tar.bz2 upstream-91750d01a7a0b56a880a147a825d097aaac7f53d.zip | |
busybox: update to v1.14.4 (closes: #5619)
SVN-Revision: 17782
Diffstat (limited to 'package/busybox/patches/802-brctl_linux24.patch')
| -rw-r--r-- | package/busybox/patches/802-brctl_linux24.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/busybox/patches/802-brctl_linux24.patch b/package/busybox/patches/802-brctl_linux24.patch index 84321e0c72..9081e5adc4 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 -@@ -18,7 +18,7 @@ +@@ -32,7 +32,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. */ -@@ -155,6 +155,7 @@ int brctl_main(int argc UNUSED_PARAM, ch +@@ -169,6 +169,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); -@@ -183,9 +184,19 @@ int brctl_main(int argc UNUSED_PARAM, ch +@@ -197,9 +198,19 @@ int brctl_main(int argc UNUSED_PARAM, ch br = *argv++; if (key == ARG_addbr || key == ARG_delbr) { /* addbr or delbr */ @@ -40,9 +40,9 @@ goto done; } -@@ -194,14 +205,27 @@ int brctl_main(int argc UNUSED_PARAM, ch +@@ -208,14 +219,27 @@ int brctl_main(int argc UNUSED_PARAM, ch - strncpy(ifr.ifr_name, br, IFNAMSIZ); + strncpy_IFNAMSIZ(ifr.ifr_name, br); if (key == ARG_addif || key == ARG_delif) { /* addif or delif */ + int ret; + int if_index; |