From 3038ac9c1977c8472fdda2d833a4e4fd5ba6ea94 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Sat, 30 Sep 2006 19:37:25 +0000
Subject: vconfig: fix bug 701 (I be damned if I understand it)

---
 archival/libunarchive/decompress_unzip.c | 12 ++++++------
 networking/vconfig.c                     |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 74de9af..989ac4f 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -806,11 +806,11 @@ static int inflate_get_next_window(void)
 		}
 
 		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 @@ int inflate_gunzip(int in, int out)
 	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;
 	}
 
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 15a6110..6c808eb 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -72,7 +72,7 @@ static const char cmds[] = {
 	'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 @@ int vconfig_main(int argc, char **argv)
 		 * 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 @@ int vconfig_main(int argc, char **argv)
 
 	return 0;
 }
-
-- 
cgit v1.1