From 2db14af0b046ad6c86e084fa005040053df77c89 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 22 May 2026 15:38:56 +0000 Subject: [PATCH] mtdsplit: tplink: Remove unused boot_ofs and boot_len fields The `boot_ofs` and `boot_len` fields in `struct fw_v1` and `struct fw_v2` were marked as FIXME and completely unused in the codebase. This commit removes them to improve code clarity. To maintain strict ABI compatibility, binary layout, and overall sizes of these packed structures, equivalent byte padding was introduced in both structs. Signed-off-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: manupawickramasinghe <73810867+manupawickramasinghe@users.noreply.github.com> --- .../generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c index 8909c107a09489..32e5cad057e8f0 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c @@ -41,9 +41,7 @@ struct fw_v1 { uint32_t kernel_len; /* kernel data length */ uint32_t rootfs_ofs; /* rootfs data offset */ uint32_t rootfs_len; /* rootfs data length */ - uint32_t boot_ofs; /* bootloader data offset */ - uint32_t boot_len; /* bootloader data length */ - uint8_t pad[360]; + uint8_t pad[368]; } __attribute__ ((packed)); struct fw_v2 { @@ -63,8 +61,7 @@ struct fw_v2 { uint32_t kernel_len; /* 0x78: kernel data length */ uint32_t rootfs_ofs; /* 0x7c: rootfs data offset */ uint32_t rootfs_len; /* 0x80: rootfs data length */ - uint32_t boot_ofs; /* 0x84: FIXME: seems to be unused */ - uint32_t boot_len; /* 0x88: FIXME: seems to be unused */ + uint8_t pad1[8]; /* 0x84: unused */ uint16_t unk4; /* 0x8c: 0x55aa */ uint8_t sver_hi; /* 0x8e */ uint8_t sver_lo; /* 0x8f */