X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fbroadcom-wl%2Fpatches%2F100-fix_nvram_two_devices.patch;fp=package%2Fbroadcom-wl%2Fpatches%2F100-fix_nvram_two_devices.patch;h=0000000000000000000000000000000000000000;hb=4d953d3a481dd847524eae78c7aae00153bc7efd;hp=5650862f8363877d5fe2b612d7742291c15343fd;hpb=801985e5286881dd578a19280b2a6c8e212a530d;p=openwrt.git

diff --git a/package/broadcom-wl/patches/100-fix_nvram_two_devices.patch b/package/broadcom-wl/patches/100-fix_nvram_two_devices.patch
deleted file mode 100644
index 5650862f83..0000000000
--- a/package/broadcom-wl/patches/100-fix_nvram_two_devices.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/driver/nvram_stub.c
-+++ b/driver/nvram_stub.c
-@@ -22,6 +22,7 @@ typedef struct _vars {
- #define	VARS_T_OH	sizeof(vars_t)
- 
- static vars_t *vars = NULL;
-+static int nvram_init_done = 0;
- extern char *nvram_buf[];
- 
- int
-@@ -33,6 +34,10 @@ BCMATTACHFN(nvram_init)(void *si)
- 	uint nvs, bufsz;
- 	vars_t *new;
- 
-+	nvram_init_done++;
-+	if (nvram_init_done != 1)
-+		return 0;
-+
- 	osh = si_osh(sih);
- 
- 	nvs = R_REG(osh, &nvh->len) - sizeof(struct nvram_header);
-@@ -79,6 +84,10 @@ BCMATTACHFN(nvram_exit)(void *si)
- 	vars_t *this, *next;
- 	si_t *sih;
- 
-+	nvram_init_done--;
-+	if (nvram_init_done != 0)
-+		return 0;
-+
- 	sih = (si_t *)si;
- 	this = vars;
- 	while (this) {