1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-12 19:42:48 +02:00
openwrt-xburst/package/broadcom-wl/patches/100-fix_nvram_two_devices.patch
hauke 804a5ec71b broadcom-wl: fix two problems when more then one wifi card is available.
* The device should get a unique name at the beginning and not wl%d.
* load the nvram just one time into the own buffer, also when there is
  more than one device.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34381 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-11-25 20:11:15 +00:00

33 lines
669 B
Diff

--- 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) {