From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 3 Dec 2011 16:57:21 +0000 (+0000)
Subject: firmware-utils/mktplinkfw: fix combined image creation
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/f2bac60361e3963954b30a49c59abcc42d570020

firmware-utils/mktplinkfw: fix combined image creation

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29409 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
index 04234fd63..a1669cee5 100644
--- a/tools/firmware-utils/src/mktplinkfw.c
+++ b/tools/firmware-utils/src/mktplinkfw.c
@@ -551,7 +551,7 @@ static int build_fw(void)
 	if (ret)
 		goto out_free_buf;
 
-	writelen = kernel_info.file_size;
+	writelen = sizeof(struct fw_header) + kernel_info.file_size;
 
 	if (!combined) {
 		p = buf + rootfs_ofs;