From c75c70081b31abd7cf95670fad890f990e2699c0 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 8 Jun 2009 12:00:59 +0000 Subject: [PATCH] Merge r16378 to 8.09 SVN-Revision: 16379 --- package/nvram-brcm47xx/Makefile | 2 +- package/nvram-brcm47xx/src/nvram.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/nvram-brcm47xx/Makefile b/package/nvram-brcm47xx/Makefile index d5954e8eef..ce7c86203d 100644 --- a/package/nvram-brcm47xx/Makefile +++ b/package/nvram-brcm47xx/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nvram-brcm47xx -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/package/nvram-brcm47xx/src/nvram.c b/package/nvram-brcm47xx/src/nvram.c index 78baa9431d..ed3da4312b 100644 --- a/package/nvram-brcm47xx/src/nvram.c +++ b/package/nvram-brcm47xx/src/nvram.c @@ -411,8 +411,18 @@ char * nvram_find_mtd(void) char dev[PATH_MAX]; char *path = NULL; struct stat s; + int supported = 1; - if( (fp = fopen("/proc/mtd", "r")) ) + /* Refuse any operation on the WGT634U */ + if( (fp = fopen("/proc/diag/model", "r")) ) + { + if( fgets(dev, sizeof(dev), fp) && !strncmp(dev, "Netgear WGT634U", 15) ) + supported = 0; + + fclose(fp); + } + + if( supported && (fp = fopen("/proc/mtd", "r")) ) { while( fgets(dev, sizeof(dev), fp) ) { -- 2.30.2