[kernel] netfilter: minor IMQ fix for 2.6.25

[openwrt.git] / package / broadcom-diag / src / diag.c

diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index e1655d0..a4bad4d 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -491,7 +491,8 @@ static struct platform_t __initdata platforms[] = {
                        /* No usable buttons */
                },
                .leds           = {
                        /* No usable buttons */
                },
                .leds           = {

-                       { .name = "dmz",        .gpio = 1 << 4, .polarity = REVERSE },
+//                     { .name = "power",      .gpio = 1 << 0  .polarity = REVERSE },  // Usable when retrofitting D26 (?)
+                       { .name = "dmz",        .gpio = 1 << 4, .polarity = REVERSE },  // actual name WWW

                        { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
                },
        },
                        { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
                },
        },


@@ -502,7 +503,7 @@ static struct platform_t __initdata platforms[] = {
                },
                .leds           = {
                        { .name = "power",      .gpio = 1 << 5, .polarity = REVERSE },
                },
                .leds           = {
                        { .name = "power",      .gpio = 1 << 5, .polarity = REVERSE },

-                       { .name = "dmz",        .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "dmz",        .gpio = 1 << 0, .polarity = REVERSE },  // actual name WWW

                        { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
                },
        },
                        { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
                },
        },


@@ -682,7 +683,7 @@ static struct platform_t __init *platform_detect(void)
        /* Look for a model identifier */
 
        /* Based on "model_name" */
        /* Look for a model identifier */
 
        /* Based on "model_name" */

-       if (buf = nvram_get("model_name")) {
+       if ((buf = nvram_get("model_name"))) {

                if (!strcmp(buf, "DIR-130"))
                        return &platforms[DIR130];
                if (!strcmp(buf, "DIR-330"))
                if (!strcmp(buf, "DIR-130"))
                        return &platforms[DIR130];
                if (!strcmp(buf, "DIR-330"))


@@ -690,13 +691,13 @@ static struct platform_t __init *platform_detect(void)
        }
 
        /* Based on "model_no" */
        }
 
        /* Based on "model_no" */

-       if (buf = nvram_get("model_no")) {
+       if ((buf = nvram_get("model_no"))) {

                if (startswith(buf,"WL700")) /* WL700* */
                        return &platforms[WL700GE];
        }
 
        /* Based on "hardware_version" */
                if (startswith(buf,"WL700")) /* WL700* */
                        return &platforms[WL700GE];
        }
 
        /* Based on "hardware_version" */

-       if (buf = nvram_get("hardware_version")) {
+       if ((buf = nvram_get("hardware_version"))) {

                if (startswith(buf,"WL500GPV2-")) /* WL500GPV2-* */
                        return &platforms[WL500GPV2];
                if (startswith(buf,"WL520GC-")) /* WL520GU-* */
                if (startswith(buf,"WL500GPV2-")) /* WL500GPV2-* */
                        return &platforms[WL500GPV2];
                if (startswith(buf,"WL520GC-")) /* WL520GU-* */


@@ -706,7 +707,7 @@ static struct platform_t __init *platform_detect(void)
        }
 
        /* Based on "ModelId" */
        }
 
        /* Based on "ModelId" */

-       if (buf = nvram_get("ModelId")) {
+       if ((buf = nvram_get("ModelId"))) {

                if (!strcmp(buf, "WR850GP"))
                        return &platforms[WR850GP];
                if (!strcmp(buf,"WX-5565"))
                if (!strcmp(buf, "WR850GP"))
                        return &platforms[WR850GP];
                if (!strcmp(buf,"WX-5565"))


@@ -770,6 +771,9 @@ static struct platform_t __init *platform_detect(void)
                if (!strcmp(boardnum, "10496"))
                        return &platforms[USR5461];
 
                if (!strcmp(boardnum, "10496"))
                        return &platforms[USR5461];
 

+               if (!strcmp(getvar("boardtype"), "0x0101") && !strcmp(getvar("boardrev"), "0x10")) /* SE505V2 With Modified CFE */
+                       return &platforms[SE505V2];
+               

        } else { /* PMON based - old stuff */
                if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) &&
                        (simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) {
        } else { /* PMON based - old stuff */
                if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) &&
                        (simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) {