From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 20 Apr 2009 10:29:43 +0000 (+0000)
Subject: merge r15290 to 8.09
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f59f7b6f61087bfd4380b2efa9b2867ccf2f295b;p=openwrt%2Fsvn-archive%2Farchive.git

merge r15290 to 8.09

SVN-Revision: 15291
---

diff --git a/package/switch/Makefile b/package/switch/Makefile
index 43a4ee24b6..d97d84c22d 100644
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kmod-switch
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c
index 779b89f615..002aa04289 100644
--- a/package/switch/src/switch-robo.c
+++ b/package/switch/src/switch-robo.c
@@ -67,6 +67,9 @@
 #define bool int
 #endif
 
+
+extern char *nvram_get(const char *name);
+
 /* Data structure for a Roboswitch device. */
 struct robo_switch {
 	char *device;			/* The device name string (ethX) */
@@ -270,8 +273,9 @@ static int robo_switch_enable(void)
 			robo_write16(ROBO_CTRL_PAGE, i, 0);
 	}
 
-	/* WAN port LED */
-	robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F);
+	/* WAN port LED, except for Netgear WGT634U */
+	if (strcmp(nvram_get("nvram_type"), "cfe"))
+		robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F);
 
 	return 0;
 }