[package] iwinfo: fix logic flaw in mtd partition check

[openwrt/svn-archive/archive.git] / package / iwinfo / src / iwinfo_utils.c

diff --git a/package/iwinfo/src/iwinfo_utils.c b/package/iwinfo/src/iwinfo_utils.c
index ec6aa2233f38ac38cc6e1ea752785fde964cad44..b21f791a65ce0aebb8f80d970eb6bfd5a95b4ece 100644 (file)
--- a/package/iwinfo/src/iwinfo_utils.c
+++ b/package/iwinfo/src/iwinfo_utils.c
@@ -165,7 +165,7 @@ int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id)
        while (fgets(buf, sizeof(buf), mtd) > 0)
        {
                if (fscanf(mtd, "mtd%d: %*x %x %127s", &off, &len, buf) < 3 ||
-                   strcmp(buf, "\"boardconfig\""))
+                   (strcmp(buf, "\"boardconfig\"") && strcmp(buf, "\"EEPROM\"")))
                {
                        off = -1;
                        continue;
@@ -184,7 +184,7 @@ int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id)
        if ((fd = open(buf, O_RDONLY)) < 0)
                return -1;
 
-       bc = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_LOCKED, fd, 0);
+       bc = mmap(NULL, len, PROT_READ, MAP_PRIVATE|MAP_LOCKED, fd, 0);
 
        if ((void *)bc != MAP_FAILED)
        {
@@ -193,6 +193,7 @@ int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id)
 
                for (off = len / 2 - 0x800; off >= 0; off -= 0x800)
                {
+                       /* AR531X board data magic */
                        if ((bc[off] == 0x3533) && (bc[off + 1] == 0x3131))
                        {
                                id->vendor_id = bc[off + 0x7d];
@@ -201,6 +202,16 @@ int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id)
                                id->subsystem_device_id = bc[off + 0x83];
                                break;
                        }
+
+                       /* AR5416 EEPROM magic */
+                       else if ((bc[off] == 0xA55A) || (bc[off] == 0x5AA5))
+                       {
+                               id->vendor_id = bc[off + 0x0D];
+                               id->device_id = bc[off + 0x0E];
+                               id->subsystem_vendor_id = bc[off + 0x13];
+                               id->subsystem_device_id = bc[off + 0x14];
+                               break;
+                       }
                }
 
                munmap(bc, len);