summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/bcmdhd/dhd.h
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-10-25 16:32:46 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:39:14 -0800
commitdfd7f3b1c9ccaeea2a098774952e2bb5add38b84 (patch)
tree6e790c45c101c2503589c606f90408377af051e1 /drivers/net/wireless/bcmdhd/dhd.h
parent9ff09004d6a89b67b9c051186816e350f565021e (diff)
net: wireless: bcmdhd: Update to version 5.90.125.94
- Fix WFD interface removal - Fix profile update - Keep same mode for softap or WFD during early suspend - Add dhd_console_ms parameter access Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd.h')
-rw-r--r--drivers/net/wireless/bcmdhd/dhd.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd.h b/drivers/net/wireless/bcmdhd/dhd.h
index fae07abaad9d..0ea5d4a9961d 100644
--- a/drivers/net/wireless/bcmdhd/dhd.h
+++ b/drivers/net/wireless/bcmdhd/dhd.h
@@ -24,7 +24,7 @@
* software in any way with any other Broadcom software provided under a license
* other than the GPL, without Broadcom's express prior written consent.
*
- * $Id: dhd.h 285209 2011-09-21 01:21:24Z $
+ * $Id: dhd.h 290844 2011-10-20 08:54:39Z $
*/
/****************
@@ -107,6 +107,15 @@ enum dhd_prealloc_index {
DHD_PREALLOC_OSL_BUF
};
+typedef enum {
+ DHD_IF_NONE = 0,
+ DHD_IF_ADD,
+ DHD_IF_DEL,
+ DHD_IF_CHANGE,
+ DHD_IF_DELETING
+} dhd_if_state_t;
+
+
#if defined(DHD_USE_STATIC_BUF)
uint8* dhd_os_prealloc(void *osh, int section, uint size);
@@ -412,6 +421,7 @@ extern int dhd_dev_pno_set(struct net_device *dev, wlc_ssid_t* ssids_local,
extern int dhd_dev_pno_enable(struct net_device *dev, int pfn_enabled);
extern int dhd_dev_get_pno_status(struct net_device *dev);
extern int dhd_get_dtim_skip(dhd_pub_t *dhd);
+extern bool dhd_check_ap_wfd_mode_set(dhd_pub_t *dhd);
#define DHD_UNICAST_FILTER_NUM 0
#define DHD_BROADCAST_FILTER_NUM 1
@@ -476,8 +486,7 @@ extern uint dhd_bus_status(dhd_pub_t *dhdp);
extern int dhd_bus_start(dhd_pub_t *dhdp);
extern int dhd_bus_membytes(dhd_pub_t *dhdp, bool set, uint32 address, uint8 *data, uint size);
extern void dhd_print_buf(void *pbuf, int len, int bytes_per_line);
-
-bool is_associated(dhd_pub_t *dhd, void *bss_buf);
+extern bool dhd_is_associated(dhd_pub_t *dhd, void *bss_buf);
#if defined(KEEP_ALIVE)
extern int dhd_keep_alive_onoff(dhd_pub_t *dhd);