merge -r15319 to 8.09 (#5005)

SVN-Revision: 15401

diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c
index 002aa042890432f0f30bb15fb4d149a65e582d4e..f69ba1f4ca398a7e1855ed45023b057d477c0729 100644 (file)
--- a/package/switch/src/switch-robo.c
+++ b/package/switch/src/switch-robo.c
@@ -69,6 +69,7 @@
 
 
 extern char *nvram_get(const char *name);
+#define getvar(str) (nvram_get(str)?:"")
 
 /* Data structure for a Roboswitch device. */
 struct robo_switch {
@@ -274,7 +275,7 @@ static int robo_switch_enable(void)
        }
 
        /* WAN port LED, except for Netgear WGT634U */
-       if (strcmp(nvram_get("nvram_type"), "cfe"))
+       if (strcmp(getvar("nvram_type"), "cfe") != 0)
                robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F);
 
        return 0;