support for the asus wl-500g deluxe and the buffalo v2 units. dnsmasq update, control file fixes. add back other boardtypes to make wl.o happy on other routers

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@390 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 17 insertions, 1 deletions

diff --git a/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c b/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c
index b3469134eb..ead31e9aa5 100644
--- a/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c
+++ b/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c
@@ -275,7 +275,7 @@ sbpci_init(void *sbh)
 	sb_core_reset(sbh, 0);
 
 	/* In some board, */ 
-	if(nvram_match("boardtype", "bcm94710dev"))
+	if(nvram_match("boardtype", "bcm94710dev") || nvram_match("boardtype", "bcm94710ap")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm95365r"))
 		CT4712_WR = 0;
 	else
 		CT4712_WR = 1;
diff --git a/package/linux/kernel-source/drivers/net/diag/diag_led.c b/package/linux/kernel-source/drivers/net/diag/diag_led.c
index 41cb17bf4d..6f1ba97324 100644
--- a/package/linux/kernel-source/drivers/net/diag/diag_led.c
+++ b/package/linux/kernel-source/drivers/net/diag/diag_led.c
@@ -5,6 +5,7 @@
 // initial release 2004/03/28
 //
 // 2004/08/26 asus & buffalo support added
+// 2005/03/14 asus wl-500g deluxe and buffalo v2 support added
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -187,11 +188,26 @@ static int __init diag_init()
 		reset_polarity=0;
 		buf=nvram_get("boardnum")?:"";
 		if (!strcmp(buf,"44")) {
+			//motorola
 			set_diag=ignore;
 			set_dmz=ignore;
 			reset_gpio=(1<<5);
 			reset_polarity=0;
 		}
+		if (!strcmp(buf,"00")) {
+			//buffalo
+			set_diag=ignore;
+			set_dmz=ignore;
+			reset_gpio=(1<<7);
+			reset_polarity=1;
+		}
+		if (!strcmp(buf,"45")) {
+			//wl-500g deluxe
+			set_diag=ignore;
+			set_dmz=ignore;
+			reset_gpio=(1<<6);
+			reset_polarity=1;
+		}
 	}
 	printk(KERN_INFO "using v%d hardware\n",board_type);