summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl12xx.h
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2011-08-17 10:45:48 +0300
committerLuciano Coelho <coelho@ti.com>2011-08-22 12:35:22 +0300
commitc302b2c959164622558474871ae942da0e484a38 (patch)
treea3282d8ab1d194d9e6780a386f941db1d0e69749 /drivers/net/wireless/wl12xx/wl12xx.h
parent7bb5d6ce9e6ebb3bb71915cb0224523d3c284b4f (diff)
downloadtalos-obmc-linux-c302b2c959164622558474871ae942da0e484a38.tar.gz
talos-obmc-linux-c302b2c959164622558474871ae942da0e484a38.zip
wl12xx: Use a single fw for both STA and AP roles
Firmware >= 6/7.3.0.0.75 (wl127x/wl128x) supports both STA and AP roles. Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl12xx.h')
-rw-r--r--drivers/net/wireless/wl12xx/wl12xx.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 5b00a84acab2..dc0013e9b9f7 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -130,10 +130,8 @@ extern u32 wl12xx_debug_level;
-#define WL1271_FW_NAME "ti-connectivity/wl1271-fw-2.bin"
-#define WL128X_FW_NAME "ti-connectivity/wl128x-fw.bin"
-#define WL127X_AP_FW_NAME "ti-connectivity/wl1271-fw-ap.bin"
-#define WL128X_AP_FW_NAME "ti-connectivity/wl128x-fw-ap.bin"
+#define WL127X_FW_NAME "ti-connectivity/wl127x-fw-3.bin"
+#define WL128X_FW_NAME "ti-connectivity/wl128x-fw-3.bin"
/*
* wl127x and wl128x are using the same NVS file name. However, the
@@ -405,7 +403,6 @@ struct wl1271 {
u8 *fw;
size_t fw_len;
- u8 fw_bss_type;
void *nvs;
size_t nvs_len;
OpenPOWER on IntegriCloud