[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox-cvs
Subject: svn commit: trunk/busybox: archival/libunarchive networking
From: vda () busybox ! net (vda at busybox ! net)
Date: 2006-09-30 19:37:25
Message-ID: 20060930193725.C40AE4859B () busybox ! net
[Download RAW message or body]
Author: vda
Date: 2006-09-30 12:37:25 -0700 (Sat, 30 Sep 2006)
New Revision: 16275
Log:
vconfig: fix bug 701 (I be damned if I understand it)
Modified:
trunk/busybox/archival/libunarchive/decompress_unzip.c
trunk/busybox/networking/vconfig.c
Changeset:
Modified: trunk/busybox/archival/libunarchive/decompress_unzip.c
===================================================================
--- trunk/busybox/archival/libunarchive/decompress_unzip.c 2006-09-30 19:21:24 UTC (rev 16274)
+++ trunk/busybox/archival/libunarchive/decompress_unzip.c 2006-09-30 19:37:25 UTC (rev 16275)
@@ -806,11 +806,11 @@
}
switch (method) {
- case -1: ret = inflate_stored(0,0,0,0);
- break;
- case -2: ret = inflate_codes(0,0,0,0,0);
- break;
- default: bb_error_msg_and_die("inflate error %d", method);
+ case -1: ret = inflate_stored(0,0,0,0);
+ break;
+ case -2: ret = inflate_codes(0,0,0,0,0);
+ break;
+ default: bb_error_msg_and_die("inflate error %d", method);
}
if (ret == 1) {
@@ -911,7 +911,7 @@
if (gunzip_bytes_out !=
(bytebuffer[bytebuffer_offset] | (bytebuffer[bytebuffer_offset+1] << 8) |
(bytebuffer[bytebuffer_offset+2] << 16) | (bytebuffer[bytebuffer_offset+3] << 24))) {
- bb_error_msg("Incorrect length");
+ bb_error_msg("incorrect length");
return -1;
}
Modified: trunk/busybox/networking/vconfig.c
===================================================================
--- trunk/busybox/networking/vconfig.c 2006-09-30 19:21:24 UTC (rev 16274)
+++ trunk/busybox/networking/vconfig.c 2006-09-30 19:37:25 UTC (rev 16275)
@@ -72,7 +72,7 @@
's', 'e', 't', '_',
'n', 'a', 'm', 'e', '_',
't', 'y', 'p', 'e', 0,
- 4, SET_VLAN_FLAG_CMD, 12,
+ 5, SET_VLAN_FLAG_CMD, 12,
's', 'e', 't', '_',
'f', 'l', 'a', 'g', 0,
5, SET_VLAN_EGRESS_PRIORITY_CMD, 18,
@@ -145,6 +145,8 @@
* more of a pain. */
if (ifr.cmd == SET_VLAN_FLAG_CMD) { /* set_flag */
ifr.u.flag = bb_xgetularg10_bnd(p, 0, 1);
+ /* DM: in order to set reorder header, qos must be set */
+ ifr.vlan_qos = bb_xgetularg10_bnd(argv[3], 0, 7);
} else if (ifr.cmd == ADD_VLAN_CMD) { /* add */
ifr.u.VID = bb_xgetularg10_bnd(p, 0, VLAN_GROUP_ARRAY_LEN-1);
} else if (ifr.cmd != DEL_VLAN_CMD) { /* set_{egress|ingress}_map */
@@ -160,4 +162,3 @@
return 0;
}
-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic