summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271.h
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2009-10-13 12:47:39 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:07 -0400
commit2b60100bf04aba28133ccb24efd85f72fb1a5494 (patch)
tree30b52402d2ea9ffe2edc7a28b02dfce4014b935e /drivers/net/wireless/wl12xx/wl1271.h
parent2cc8d4db9dd7df9dd12d86f2e37d1b4760d3dd98 (diff)
wl1271: Add structure for firmware configuration values
In order to make the firmware configuration more manageable, collect hardcoded configuration values into one data structure, and set default values there. Add the SoftGemini BT/WLAN coex paramters into the config structure. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271.h')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index aa9bb2ea855..64a327009f2 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -32,6 +32,8 @@
#include <linux/bitops.h>
#include <net/mac80211.h>
+#include "wl1271_conf.h"
+
#define DRIVER_NAME "wl1271"
#define DRIVER_PREFIX DRIVER_NAME ": "
@@ -420,6 +422,9 @@ struct wl1271 {
/* Used for a workaround to send disconnect before rejoining */
bool joined;
+
+ /* Current chipset configuration */
+ struct conf_drv_settings conf;
};
int wl1271_plt_start(struct wl1271 *wl);