diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-05-15 17:25:40 -0700 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-13 16:54:28 +0530 |
| commit | e5e907bf14ef0e4bcfa00cb394ed1710006bcc1a (patch) | |
| tree | 8b1c740e476283557c4bea8fcf2c457baf2297ce /drivers/net/wireless/bcmdhd/dhd_common.c | |
| parent | 3f4512b21846a99b8f949a40ca5d90695bf55684 (diff) | |
net: wireless: bcmdhd: Update to version 1.27
Change-Id: Ib7dba8821fbb455ca9b1cc3d3713c9e29d180fe8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_common.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_common.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c index 08b2d5fd7fcc..9b5811ce29a1 100644 --- a/drivers/net/wireless/bcmdhd/dhd_common.c +++ b/drivers/net/wireless/bcmdhd/dhd_common.c @@ -21,7 +21,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_common.c 321870 2012-03-17 00:43:35Z $ + * $Id: dhd_common.c 327331 2012-04-13 01:42:33Z $ */ #include <typedefs.h> #include <osl.h> @@ -1829,10 +1829,24 @@ exit: bool dhd_check_ap_wfd_mode_set(dhd_pub_t *dhd) { #ifdef WL_CFG80211 +#ifndef WL_ENABLE_P2P_IF + /* To be back compatble with ICS MR1 release where p2p interface + * disable but wlan0 used for p2p + */ if (((dhd->op_mode & HOSTAPD_MASK) == HOSTAPD_MASK) || - ((dhd->op_mode & WFD_MASK) == WFD_MASK)) + ((dhd->op_mode & WFD_MASK) == WFD_MASK)) { + return TRUE; + } + else +#else + /* concurent mode with p2p interface for wfd and wlan0 for sta */ + if (((dhd->op_mode & P2P_GO_ENABLED) == P2P_GO_ENABLED) || + ((dhd->op_mode & P2P_GC_ENABLED) == P2P_GC_ENABLED)) { + DHD_ERROR(("%s P2P enabled for mode=%d\n", __FUNCTION__, dhd->op_mode)); return TRUE; + } else +#endif /* WL_ENABLE_P2P_IF */ #endif /* WL_CFG80211 */ return FALSE; } |