Added missing tegra files.HEADmaster

1 files changed, 1469 insertions, 0 deletions

diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
new file mode 100644
index 00000000000..4ee6557e17d
--- /dev/null
+++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
@@ -0,0 +1,1469 @@
+/*
+ * Linux cfgp2p driver
+ *
+ * Copyright (C) 1999-2011, Broadcom Corporation
+ * 
+ *         Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * 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: wl_cfgp2p.c,v 1.1.4.1.2.14 2011-02-09 01:40:07 $
+ *
+ */
+#include <typedefs.h>
+#include <linuxver.h>
+#include <osl.h>
+#include <linux/kernel.h>
+#include <linux/kthread.h>
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/if_arp.h>
+#include <asm/uaccess.h>
+
+#include <bcmutils.h>
+#include <bcmendian.h>
+#include <proto/ethernet.h>
+#include <dngl_stats.h>
+#include <dhd.h>
+#include <dhdioctl.h>
+#include <wlioctl.h>
+
+#include <wl_cfg80211.h>
+#include <wl_cfgp2p.h>
+#include <wldev_common.h>
+
+
+static s8 ioctlbuf[WLC_IOCTL_MAXLEN];
+static s8 scanparambuf[WLC_IOCTL_SMLEN];
+static s8 *smbuf = ioctlbuf;
+
+static bool
+wl_cfgp2p_has_ie(u8 *ie, u8 **tlvs, u32 *tlvs_len, const u8 *oui, u32 oui_len, u8 type);
+
+static s32
+wl_cfgp2p_vndr_ie(struct net_device *ndev, s32 bssidx, s32 pktflag,
+            s8 *oui, s32 ie_id, s8 *data, s32 data_len, s32 delete);
+/*
+ *  Initialize variables related to P2P
+ *
+ */
+s32
+wl_cfgp2p_init_priv(struct wl_priv *wl)
+{
+        if (!(wl->p2p = kzalloc(sizeof(struct p2p_info), GFP_KERNEL))) {
+                CFGP2P_ERR(("struct p2p_info allocation failed\n"));
+                return -ENOMEM;
+        }
+#define INIT_IE(IE_TYPE, BSS_TYPE)              \
+        do {                                                    \
+                memset(wl_to_p2p_bss_saved_ie(wl, BSS_TYPE).p2p_ ## IE_TYPE ## _ie, 0, \
+                   sizeof(wl_to_p2p_bss_saved_ie(wl, BSS_TYPE).p2p_ ## IE_TYPE ## _ie)); \
+                wl_to_p2p_bss_saved_ie(wl, BSS_TYPE).p2p_ ## IE_TYPE ## _ie_len = 0; \
+        } while (0);
+
+        INIT_IE(probe_req, P2PAPI_BSSCFG_PRIMARY);
+        INIT_IE(probe_res, P2PAPI_BSSCFG_PRIMARY);
+        INIT_IE(assoc_req, P2PAPI_BSSCFG_PRIMARY);
+        INIT_IE(assoc_res, P2PAPI_BSSCFG_PRIMARY);
+        INIT_IE(beacon,    P2PAPI_BSSCFG_PRIMARY);
+        INIT_IE(probe_req, P2PAPI_BSSCFG_DEVICE);
+        INIT_IE(probe_res, P2PAPI_BSSCFG_DEVICE);
+        INIT_IE(assoc_req, P2PAPI_BSSCFG_DEVICE);
+        INIT_IE(assoc_res, P2PAPI_BSSCFG_DEVICE);
+        INIT_IE(beacon,    P2PAPI_BSSCFG_DEVICE);
+        INIT_IE(probe_req, P2PAPI_BSSCFG_CONNECTION);
+        INIT_IE(probe_res, P2PAPI_BSSCFG_CONNECTION);
+        INIT_IE(assoc_req, P2PAPI_BSSCFG_CONNECTION);
+        INIT_IE(assoc_res, P2PAPI_BSSCFG_CONNECTION);
+        INIT_IE(beacon,    P2PAPI_BSSCFG_CONNECTION);
+#undef INIT_IE
+        wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_PRIMARY) = wl_to_prmry_ndev(wl);
+        wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_PRIMARY) = 0;
+        wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_DEVICE) = NULL;
+        wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE) = 0;
+        wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION) = NULL;
+        wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_CONNECTION) = 0;
+        spin_lock_init(&wl->p2p->timer_lock);
+        return BCME_OK;
+
+}
+/*
+ *  Deinitialize variables related to P2P
+ *
+ */
+void
+wl_cfgp2p_deinit_priv(struct wl_priv *wl)
+{
+        if (wl->p2p) {
+                kfree(wl->p2p);
+                wl->p2p = NULL;
+        }
+        wl->p2p_supported = 0;
+}
+/*
+ * Set P2P functions into firmware
+ */
+s32
+wl_cfgp2p_set_firm_p2p(struct wl_priv *wl)
+{
+        struct net_device *ndev = wl_to_prmry_ndev(wl);
+        struct ether_addr null_eth_addr = { { 0, 0, 0, 0, 0, 0 } };
+        s32 ret = BCME_OK;
+        s32 val = 0;
+        /* Do we have to check whether APSTA is enabled or not ? */
+        wldev_iovar_getint(ndev, "apsta", &val);
+        if (val == 0) {
+                val = 1;
+                wldev_ioctl(ndev, WLC_DOWN, &val, sizeof(s32), true);
+                wldev_iovar_setint(ndev, "apsta", val);
+                wldev_ioctl(ndev, WLC_UP, &val, sizeof(s32), true);
+        }
+        val = 1;
+        /* Disable firmware roaming for P2P  */
+        wldev_iovar_setint(ndev, "roam_off", val);
+        /* In case of COB type, firmware has default mac address
+         * After Initializing firmware, we have to set current mac address to
+         * firmware for P2P device address
+         */
+        ret = wldev_iovar_setbuf_bsscfg(ndev, "p2p_da_override", &null_eth_addr,
+                    sizeof(null_eth_addr), ioctlbuf, sizeof(ioctlbuf), 0);
+        if (ret && ret != BCME_UNSUPPORTED) {
+                CFGP2P_ERR(("failed to update device address\n"));
+        }
+        return ret;
+}
+
+/* Create a new P2P BSS.
+ * Parameters:
+ * @mac      : MAC address of the BSS to create
+ * @if_type  : interface type: WL_P2P_IF_GO or WL_P2P_IF_CLIENT
+ * @chspec   : chspec to use if creating a GO BSS.
+ * Returns 0 if success.
+ */
+s32
+wl_cfgp2p_ifadd(struct wl_priv *wl, struct ether_addr *mac, u8 if_type,
+            chanspec_t chspec)
+{
+        wl_p2p_if_t ifreq;
+        s32 err;
+        struct net_device *ndev = wl_to_prmry_ndev(wl);
+
+        ifreq.type = if_type;
+        ifreq.chspec = chspec;
+        memcpy(ifreq.addr.octet, mac->octet, sizeof(ifreq.addr.octet));
+
+        CFGP2P_INFO(("---wl p2p_ifadd %02x:%02x:%02x:%02x:%02x:%02x %s %u\n",
+            ifreq.addr.octet[0], ifreq.addr.octet[1], ifreq.addr.octet[2],
+                ifreq.addr.octet[3], ifreq.addr.octet[4], ifreq.addr.octet[5],
+                (if_type == WL_P2P_IF_GO) ? "go" : "client",
+                (chspec & WL_CHANSPEC_CHAN_MASK) >> WL_CHANSPEC_CHAN_SHIFT));
+
+        err = wldev_iovar_setbuf(ndev, "p2p_ifadd", &ifreq, sizeof(ifreq),
+                ioctlbuf, sizeof(ioctlbuf));
+        return err;
+}
+
+/* Delete a P2P BSS.
+ * Parameters:
+ * @mac      : MAC address of the BSS to create
+ * Returns 0 if success.
+ */
+s32
+wl_cfgp2p_ifdel(struct wl_priv *wl, struct ether_addr *mac)
+{
+        s32 ret;
+        struct net_device *netdev = wl_to_prmry_ndev(wl);
+
+        CFGP2P_INFO(("------primary idx %d : wl p2p_ifdel %02x:%02x:%02x:%02x:%02x:%02x\n",
+            netdev->ifindex, mac->octet[0], mac->octet[1], mac->octet[2],
+            mac->octet[3], mac->octet[4], mac->octet[5]));
+        ret = wldev_iovar_setbuf(netdev, "p2p_ifdel", mac, sizeof(*mac),
+                ioctlbuf, sizeof(ioctlbuf));
+        if (unlikely(ret < 0)) {
+                printk("'wl p2p_ifdel' error %d\n", ret);
+        }
+        return ret;
+}
+
+/* Change a P2P Role.
+ * Parameters:
+ * @mac      : MAC address of the BSS to change a role
+ * Returns 0 if success.
+ */
+s32
+wl_cfgp2p_ifchange(struct wl_priv *wl, struct ether_addr *mac, u8 if_type,
+            chanspec_t chspec)
+{
+        wl_p2p_if_t ifreq;
+        s32 err;
+        struct net_device *netdev =  wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION);
+
+        ifreq.type = if_type;
+        ifreq.chspec = chspec;
+        memcpy(ifreq.addr.octet, mac->octet, sizeof(ifreq.addr.octet));
+
+        CFGP2P_INFO(("---wl p2p_ifchange %02x:%02x:%02x:%02x:%02x:%02x %s %u\n",
+            ifreq.addr.octet[0], ifreq.addr.octet[1], ifreq.addr.octet[2],
+            ifreq.addr.octet[3], ifreq.addr.octet[4], ifreq.addr.octet[5],
+            (if_type == WL_P2P_IF_GO) ? "go" : "client",
+                (chspec & WL_CHANSPEC_CHAN_MASK) >> WL_CHANSPEC_CHAN_SHIFT));
+
+        err = wldev_iovar_setbuf(netdev, "p2p_ifupd", &ifreq, sizeof(ifreq),
+                ioctlbuf, sizeof(ioctlbuf));
+
+        if (unlikely(err < 0)) {
+                printk("'wl p2p_ifupd' error %d\n", err);
+        }
+        return err;
+}
+
+
+/* Get the index of a created P2P BSS.
+ * Parameters:
+ * @mac      : MAC address of the created BSS
+ * @index    : output: index of created BSS
+ * Returns 0 if success.
+ */
+s32
+wl_cfgp2p_ifidx(struct wl_priv *wl, struct ether_addr *mac, s32 *index)
+{
+        s32 ret;
+        u8 getbuf[64];
+        struct net_device *dev = wl_to_prmry_ndev(wl);
+
+        CFGP2P_INFO(("---wl p2p_if %02x:%02x:%02x:%02x:%02x:%02x\n",
+            mac->octet[0], mac->octet[1], mac->octet[2],
+            mac->octet[3], mac->octet[4], mac->octet[5]));
+
+        ret = wldev_iovar_getbuf_bsscfg(dev, "p2p_if", mac, sizeof(*mac),
+                    getbuf, sizeof(getbuf), wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_PRIMARY));
+
+        if (ret == 0) {
+                memcpy(index, getbuf, sizeof(index));
+                CFGP2P_INFO(("---wl p2p_if   ==> %d\n", *index));
+        }
+
+        return ret;
+}
+
+s32
+wl_cfgp2p_set_discovery(struct wl_priv *wl, s32 on)
+{
+        s32 ret = BCME_OK;
+        struct net_device *ndev = wl_to_prmry_ndev(wl);
+        CFGP2P_DBG(("enter\n"));
+
+        ret = wldev_iovar_setint(ndev, "p2p_disc", on);
+
+        if (unlikely(ret < 0)) {
+                CFGP2P_ERR(("p2p_disc %d error %d\n", on, ret));
+        }
+
+        return ret;
+}
+
+/* Set the WL driver's P2P mode.
+ * Parameters :
+ * @mode      : is one of WL_P2P_DISC_ST_{SCAN,LISTEN,SEARCH}.
+ * @channel   : the channel to listen
+ * @listen_ms : the time (milli seconds) to wait
+ * @bssidx    : bss index for BSSCFG
+ * Returns 0 if success
+ */
+
+s32
+wl_cfgp2p_set_p2p_mode(struct wl_priv *wl, u8 mode, u32 channel, u16 listen_ms, int bssidx)
+{
+        wl_p2p_disc_st_t discovery_mode;
+        s32 ret;
+        struct net_device *dev;
+        CFGP2P_DBG(("enter\n"));
+
+        if (unlikely(bssidx >= P2PAPI_BSSCFG_MAX)) {
+                CFGP2P_ERR((" %d index out of range\n", bssidx));
+                return -1;
+        }
+
+        dev = wl_to_p2p_bss_ndev(wl, bssidx);
+        if (unlikely(dev == NULL)) {
+                CFGP2P_ERR(("bssidx %d is not assigned\n", bssidx));
+                return BCME_NOTFOUND;
+        }
+
+        /* Put the WL driver into P2P Listen Mode to respond to P2P probe reqs */
+        discovery_mode.state = mode;
+        discovery_mode.chspec = CH20MHZ_CHSPEC(channel);
+        discovery_mode.dwell = listen_ms;
+        ret = wldev_iovar_setbuf_bsscfg(dev, "p2p_state", &discovery_mode,
+                    sizeof(discovery_mode), ioctlbuf, sizeof(ioctlbuf), bssidx);
+
+        return ret;
+}
+
+/* Get the index of the P2P Discovery BSS */
+s32
+wl_cfgp2p_get_disc_idx(struct wl_priv *wl, s32 *index)
+{
+        s32 ret;
+        struct net_device *dev = wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_PRIMARY);
+
+        ret = wldev_iovar_getint(dev, "p2p_dev", index);
+        CFGP2P_INFO(("p2p_dev bsscfg_idx=%d ret=%d\n", *index, ret));
+
+        if (unlikely(ret <  0)) {
+            CFGP2P_ERR(("'p2p_dev' error %d\n", ret));
+                return ret;
+        }
+        return ret;
+}
+
+s32
+wl_cfgp2p_init_discovery(struct wl_priv *wl)
+{
+
+        s32 index = 0;
+        s32 ret = BCME_OK;
+
+        CFGP2P_DBG(("enter\n"));
+
+        if (wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE) != 0) {
+                CFGP2P_ERR(("do nothing, already initialized\n"));
+                return ret;
+        }
+
+        ret = wl_cfgp2p_set_discovery(wl, 1);
+        if (ret < 0) {
+                CFGP2P_ERR(("set discover error\n"));
+                return ret;
+        }
+        /* Enable P2P Discovery in the WL Driver */
+        ret = wl_cfgp2p_get_disc_idx(wl, &index);
+
+        if (ret < 0) {
+                return ret;
+        }
+        wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_DEVICE) =
+            wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_PRIMARY);
+        wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE) = index;
+
+        /* Set the initial discovery state to SCAN */
+        ret = wl_cfgp2p_set_p2p_mode(wl, WL_P2P_DISC_ST_SCAN, 0, 0,
+                wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE));
+
+        if (unlikely(ret != 0)) {
+                CFGP2P_ERR(("unable to set WL_P2P_DISC_ST_SCAN\n"));
+                wl_cfgp2p_set_discovery(wl, 0);
+                wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE) = 0;
+                wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_DEVICE) = NULL;
+                return 0;
+        }
+        return ret;
+}
+
+/* Deinitialize P2P Discovery
+ * Parameters :
+ * @wl        : wl_private data
+ * Returns 0 if succes
+ */
+s32
+wl_cfgp2p_deinit_discovery(struct wl_priv *wl)
+{
+        s32 ret = BCME_OK;
+        CFGP2P_DBG(("enter\n"));
+
+        if (wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE) == 0) {
+                CFGP2P_ERR(("do nothing, not initialized\n"));
+                return -1;
+        }
+        /* Set the discovery state to SCAN */
+        ret = wl_cfgp2p_set_p2p_mode(wl, WL_P2P_DISC_ST_SCAN, 0, 0,
+                    wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE));
+        /* Disable P2P discovery in the WL driver (deletes the discovery BSSCFG) */
+        ret = wl_cfgp2p_set_discovery(wl, 0);
+
+        /* Clear our saved WPS and P2P IEs for the discovery BSS.  The driver
+         * deleted these IEs when wl_cfgp2p_set_discovery() deleted the discovery
+         * BSS.
+         */
+
+        /* Clear the saved bsscfg index of the discovery BSSCFG to indicate we
+         * have no discovery BSS.
+         */
+        wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE) = 0;
+        wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_DEVICE) = NULL;
+
+        return ret;
+
+}
+/* Enable P2P Discovery
+ * Parameters:
+ * @wl  : wl_private data
+ * @ie  : probe request ie (WPS IE + P2P IE)
+ * @ie_len   : probe request ie length
+ * Returns 0 if success.
+ */
+s32
+wl_cfgp2p_enable_discovery(struct wl_priv *wl, struct net_device *dev, const u8 *ie, u32 ie_len)
+{
+        s32 ret = BCME_OK;
+        if (wl_get_p2p_status(wl, DISCOVERY_ON)) {
+                CFGP2P_INFO((" DISCOVERY is already initialized, we have nothing to do\n"));
+                goto set_ie;
+        }
+
+        wl_set_p2p_status(wl, DISCOVERY_ON);
+
+        CFGP2P_DBG(("enter\n"));
+
+        ret = wl_cfgp2p_init_discovery(wl);
+        if (unlikely(ret < 0)) {
+                CFGP2P_ERR((" init discovery error %d\n", ret));
+                goto exit;
+        }
+        /* Set wsec to any non-zero value in the discovery bsscfg to ensure our
+         * P2P probe responses have the privacy bit set in the 802.11 WPA IE.
+         * Some peer devices may not initiate WPS with us if this bit is not set.
+         */
+        ret = wldev_iovar_setint_bsscfg(wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_DEVICE),
+                        "wsec", AES_ENABLED, wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE));
+        if (unlikely(ret < 0)) {
+                CFGP2P_ERR((" wsec error %d\n", ret));
+        }
+set_ie:
+        ret = wl_cfgp2p_set_management_ie(wl, dev,
+                    wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE),
+                    VNDR_IE_PRBREQ_FLAG, ie, ie_len);
+
+        if (unlikely(ret < 0)) {
+                CFGP2P_ERR(("set probreq ie occurs error %d\n", ret));
+                goto exit;
+        }
+exit:
+        return ret;
+}
+
+/* Disable P2P Discovery
+ * Parameters:
+ * @wl       : wl_private_data
+ * Returns 0 if success.
+ */
+s32
+wl_cfgp2p_disable_discovery(struct wl_priv *wl)
+{
+        s32 ret = BCME_OK;
+        CFGP2P_DBG((" enter\n"));
+        wl_clr_p2p_status(wl, DISCOVERY_ON);
+
+        if (wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE) == 0) {
+                CFGP2P_ERR((" do nothing, not initialized\n"));
+                goto exit;
+        }
+
+        ret = wl_cfgp2p_set_p2p_mode(wl, WL_P2P_DISC_ST_SCAN, 0, 0,
+                    wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE));
+
+        if (unlikely(ret < 0)) {
+
+                CFGP2P_ERR(("unable to set WL_P2P_DISC_ST_SCAN\n"));
+        }
+        /* Do a scan abort to stop the driver's scan engine in case it is still
+         * waiting out an action frame tx dwell time.
+         */
+#ifdef NOT_YET
+        if (wl_get_p2p_status(wl, SCANNING)) {
+                p2pwlu_scan_abort(hdl, FALSE);
+        }
+#endif
+        wl_clr_p2p_status(wl, DISCOVERY_ON);
+        ret = wl_cfgp2p_deinit_discovery(wl);
+
+exit:
+        return ret;
+}
+
+s32
+wl_cfgp2p_escan(struct wl_priv *wl, struct net_device *dev, u16 active,
+        u32 num_chans, u16 *channels,
+        s32 search_state, u16 action, u32 bssidx)
+{
+        s32 ret = BCME_OK;
+        s32 memsize;
+        s32 eparams_size;
+        u32 i;
+        s8 *memblk;
+        wl_p2p_scan_t *p2p_params;
+        wl_escan_params_t *eparams;
+        wlc_ssid_t ssid;
+        /* Scan parameters */
+#define P2PAPI_SCAN_NPROBES 4
+#define P2PAPI_SCAN_DWELL_TIME_MS 80
+#define P2PAPI_SCAN_SOCIAL_DWELL_TIME_MS 100
+#define P2PAPI_SCAN_HOME_TIME_MS 10
+        struct net_device *pri_dev = wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_PRIMARY);
+        wl_set_p2p_status(wl, SCANNING);
+        /* Allocate scan params which need space for 3 channels and 0 ssids */
+        eparams_size = (WL_SCAN_PARAMS_FIXED_SIZE +
+            OFFSETOF(wl_escan_params_t, params)) +
+                num_chans * sizeof(eparams->params.channel_list[0]);
+
+        memsize = sizeof(wl_p2p_scan_t) + eparams_size;
+        memblk = scanparambuf;
+        if (memsize > sizeof(scanparambuf)) {
+                CFGP2P_ERR((" scanpar buf too small (%u > %u)\n",
+                    memsize, sizeof(scanparambuf)));
+                return -1;
+        }
+        memset(memblk, 0, memsize);
+        memset(ioctlbuf, 0, sizeof(ioctlbuf));
+        if (search_state == WL_P2P_DISC_ST_SEARCH) {
+                /*
+                 * If we in SEARCH STATE, we don't need to set SSID explictly
+                 * because dongle use P2P WILDCARD internally by default
+                 */
+                wl_cfgp2p_set_p2p_mode(wl, WL_P2P_DISC_ST_SEARCH, 0, 0, bssidx);
+                ssid.SSID_len = htod32(0);
+
+        } else if (search_state == WL_P2P_DISC_ST_SCAN) {
+                /* SCAN STATE 802.11 SCAN
+                 * WFD Supplicant has p2p_find command with (type=progressive, type= full)
+                 * So if P2P_find command with type=progressive,
+                 * we have to set ssid to P2P WILDCARD because
+                 * we just do broadcast scan unless setting SSID
+                 */
+                strcpy(ssid.SSID, WL_P2P_WILDCARD_SSID);
+                ssid.SSID_len = htod32(WL_P2P_WILDCARD_SSID_LEN);
+                wl_cfgp2p_set_p2p_mode(wl, WL_P2P_DISC_ST_SCAN, 0, 0, bssidx);
+        }
+
+
+        /* Fill in the P2P scan structure at the start of the iovar param block */
+        p2p_params = (wl_p2p_scan_t*) memblk;
+        p2p_params->type = 'E';
+        /* Fill in the Scan structure that follows the P2P scan structure */
+        eparams = (wl_escan_params_t*) (p2p_params + 1);
+        eparams->params.bss_type = DOT11_BSSTYPE_ANY;
+        if (active)
+                eparams->params.scan_type = DOT11_SCANTYPE_ACTIVE;
+        else
+                eparams->params.scan_type = DOT11_SCANTYPE_PASSIVE;
+
+        memcpy(&eparams->params.bssid, &ether_bcast, ETHER_ADDR_LEN);
+        if (ssid.SSID_len)
+                memcpy(&eparams->params.ssid, &ssid, sizeof(wlc_ssid_t));
+
+        eparams->params.nprobes = htod32(P2PAPI_SCAN_NPROBES);
+        eparams->params.home_time = htod32(P2PAPI_SCAN_HOME_TIME_MS);
+        if (wl_get_drv_status(wl, CONNECTED))
+                eparams->params.active_time = htod32(-1);
+        else if (num_chans == 3)
+                eparams->params.active_time = htod32(P2PAPI_SCAN_SOCIAL_DWELL_TIME_MS);
+        else
+                eparams->params.active_time = htod32(P2PAPI_SCAN_DWELL_TIME_MS);
+        eparams->params.passive_time = htod32(-1);
+        eparams->params.channel_num = htod32((0 << WL_SCAN_PARAMS_NSSID_SHIFT) |
+            (num_chans & WL_SCAN_PARAMS_COUNT_MASK));
+
+        for (i = 0; i < num_chans; i++) {
+                eparams->params.channel_list[i] = htodchanspec(channels[i]);
+        }
+        eparams->version = htod32(ESCAN_REQ_VERSION);
+        eparams->action =  htod16(action);
+        eparams->sync_id = htod16(0x1234);
+        CFGP2P_INFO(("SCAN CHANNELS : "));
+
+        for (i = 0; i < num_chans; i++) {
+                if (i == 0) CFGP2P_INFO(("%d", channels[i]));
+                else CFGP2P_INFO((",%d", channels[i]));
+        }
+
+        CFGP2P_INFO(("\n"));
+
+        ret = wldev_iovar_setbuf_bsscfg(pri_dev, "p2p_scan",
+                    memblk, memsize, smbuf, sizeof(ioctlbuf), bssidx);
+        return ret;
+}
+/* Check whether pointed-to IE looks like WPA. */
+#define wl_cfgp2p_is_wpa_ie(ie, tlvs, len)      wl_cfgp2p_has_ie(ie, tlvs, len, \
+                (const uint8 *)WPS_OUI, WPS_OUI_LEN, WPA_OUI_TYPE)
+/* Check whether pointed-to IE looks like WPS. */
+#define wl_cfgp2p_is_wps_ie(ie, tlvs, len)      wl_cfgp2p_has_ie(ie, tlvs, len, \
+                (const uint8 *)WPS_OUI, WPS_OUI_LEN, WPS_OUI_TYPE)
+/* Check whether the given IE looks like WFA P2P IE. */
+#define wl_cfgp2p_is_p2p_ie(ie, tlvs, len)      wl_cfgp2p_has_ie(ie, tlvs, len, \
+                (const uint8 *)WFA_OUI, WFA_OUI_LEN, WFA_OUI_TYPE_P2P)
+/* Delete and Set a management vndr ie to firmware
+ * Parameters:
+ * @wl       : wl_private data
+ * @ndev     : net device for bssidx
+ * @bssidx   : bssidx for BSS
+ * @pktflag  : packet flag for IE (VNDR_IE_PRBREQ_FLAG,VNDR_IE_PRBRSP_FLAG, VNDR_IE_ASSOCRSP_FLAG,
+ *                                 VNDR_IE_ASSOCREQ_FLAG)
+ * @ie       :  VNDR IE (such as P2P IE , WPS IE)
+ * @ie_len   : VNDR IE Length
+ * Returns 0 if success.
+ */
+
+s32
+wl_cfgp2p_set_management_ie(struct wl_priv *wl, struct net_device *ndev, s32 bssidx,
+    s32 pktflag, const u8 *vndr_ie, u32 vndr_ie_len)
+{
+        /* Vendor-specific Information Element ID */
+#define VNDR_SPEC_ELEMENT_ID 0xdd
+        s32 ret = BCME_OK;
+        u32 pos;
+        u8  *ie_buf;
+        u8  *mgmt_ie_buf = NULL;
+        u32 mgmt_ie_buf_len = 0;
+        u32 *mgmt_ie_len = 0;
+        u8 ie_id, ie_len;
+        u8 delete = 0;
+#define IE_TYPE(type, bsstype) (wl_to_p2p_bss_saved_ie(wl, bsstype).p2p_ ## type ## _ie)
+#define IE_TYPE_LEN(type, bsstype) (wl_to_p2p_bss_saved_ie(wl, bsstype).p2p_ ## type ## _ie_len)
+        if (wl->p2p_supported && p2p_on(wl) && bssidx != -1) {
+                if (bssidx == P2PAPI_BSSCFG_PRIMARY)
+                        bssidx =  wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE);
+                switch (pktflag) {
+                        case VNDR_IE_PRBREQ_FLAG :
+                                mgmt_ie_buf = IE_TYPE(probe_req, bssidx);
+                                mgmt_ie_len = &IE_TYPE_LEN(probe_req, bssidx);
+                                mgmt_ie_buf_len = sizeof(IE_TYPE(probe_req, bssidx));
+                                break;
+                        case VNDR_IE_PRBRSP_FLAG :
+                                mgmt_ie_buf = IE_TYPE(probe_res, bssidx);
+                                mgmt_ie_len = &IE_TYPE_LEN(probe_res, bssidx);
+                                mgmt_ie_buf_len = sizeof(IE_TYPE(probe_res, bssidx));
+                                break;
+                        case VNDR_IE_ASSOCREQ_FLAG :
+                                mgmt_ie_buf = IE_TYPE(assoc_req, bssidx);
+                                mgmt_ie_len = &IE_TYPE_LEN(assoc_req, bssidx);
+                                mgmt_ie_buf_len = sizeof(IE_TYPE(assoc_req, bssidx));
+                                break;
+                        case VNDR_IE_ASSOCRSP_FLAG :
+                                mgmt_ie_buf = IE_TYPE(assoc_res, bssidx);
+                                mgmt_ie_len = &IE_TYPE_LEN(assoc_res, bssidx);
+                                mgmt_ie_buf_len = sizeof(IE_TYPE(assoc_res, bssidx));
+                                break;
+                        case VNDR_IE_BEACON_FLAG :
+                                mgmt_ie_buf = IE_TYPE(beacon, bssidx);
+                                mgmt_ie_len = &IE_TYPE_LEN(beacon, bssidx);
+                                mgmt_ie_buf_len = sizeof(IE_TYPE(beacon, bssidx));
+                                break;
+                        default:
+                                mgmt_ie_buf = NULL;
+                                mgmt_ie_len = NULL;
+                                CFGP2P_ERR(("not suitable type\n"));
+                                return -1;
+                }
+        } else if (get_mode_by_netdev(wl, ndev) == WL_MODE_AP) {
+                switch (pktflag) {
+                        case VNDR_IE_PRBRSP_FLAG :
+                                mgmt_ie_buf = wl->ap_info->probe_res_ie;
+                                mgmt_ie_len = &wl->ap_info->probe_res_ie_len;
+                                mgmt_ie_buf_len = sizeof(wl->ap_info->probe_res_ie);
+                                break;
+                        case VNDR_IE_BEACON_FLAG :
+                                mgmt_ie_buf = wl->ap_info->beacon_ie;
+                                mgmt_ie_len = &wl->ap_info->beacon_ie_len;
+                                mgmt_ie_buf_len = sizeof(wl->ap_info->beacon_ie);
+                                break;
+                        default:
+                                mgmt_ie_buf = NULL;
+                                mgmt_ie_len = NULL;
+                                CFGP2P_ERR(("not suitable type\n"));
+                                return -1;
+                }
+                bssidx = 0;
+        } else if (bssidx == -1 && get_mode_by_netdev(wl, ndev) == WL_MODE_BSS) {
+                switch (pktflag) {
+                        case VNDR_IE_PRBREQ_FLAG :
+                                mgmt_ie_buf = wl->sta_info->probe_req_ie;
+                                mgmt_ie_len = &wl->sta_info->probe_req_ie_len;
+                                mgmt_ie_buf_len = sizeof(wl->sta_info->probe_req_ie);
+                                break;
+                        case VNDR_IE_ASSOCREQ_FLAG :
+                                mgmt_ie_buf = wl->sta_info->assoc_req_ie;
+                                mgmt_ie_len = &wl->sta_info->assoc_req_ie_len;
+                                mgmt_ie_buf_len = sizeof(wl->sta_info->assoc_req_ie);
+                                break;
+                        default:
+                                mgmt_ie_buf = NULL;
+                                mgmt_ie_len = NULL;
+                                CFGP2P_ERR(("not suitable type\n"));
+                                return -1;
+                }
+                bssidx = 0;
+        } else {
+                CFGP2P_ERR(("not suitable type\n"));
+                return -1;
+        }
+
+        if (vndr_ie_len > mgmt_ie_buf_len) {
+                CFGP2P_ERR(("extra IE size too big\n"));
+                ret = -ENOMEM;
+        } else {
+                if (mgmt_ie_buf != NULL) {
+                        if (vndr_ie_len && (vndr_ie_len == *mgmt_ie_len) &&
+                             (memcmp(mgmt_ie_buf, vndr_ie, vndr_ie_len) == 0)) {
+                                CFGP2P_INFO(("Previous mgmt IE is equals to current IE"));
+                                goto exit;
+                        }
+                        pos = 0;
+                        delete = 1;
+                        ie_buf = (u8 *) mgmt_ie_buf;
+                        while (pos < *mgmt_ie_len) {
+                                ie_id = ie_buf[pos++];
+                                ie_len = ie_buf[pos++];
+                                if ((ie_id == DOT11_MNG_VS_ID) &&
+                                   (wl_cfgp2p_is_wps_ie(&ie_buf[pos-2], NULL, 0) ||
+                                        wl_cfgp2p_is_p2p_ie(&ie_buf[pos-2], NULL, 0))) {
+                                        CFGP2P_INFO(("DELELED ID : %d, Len : %d , OUI :"
+                                                "%02x:%02x:%02x\n", ie_id, ie_len, ie_buf[pos],
+                                                ie_buf[pos+1], ie_buf[pos+2]));
+                                        ret = wl_cfgp2p_vndr_ie(ndev, bssidx, pktflag, ie_buf+pos,
+                                            VNDR_SPEC_ELEMENT_ID, ie_buf+pos+3, ie_len-3, delete);
+                                }
+                                pos += ie_len;
+                        }
+
+                }
+                *mgmt_ie_len = 0;
+                /* Add if there is any extra IE */
+                if (vndr_ie && vndr_ie_len) {
+                        /* save the current IE in wl struct */
+                        memcpy(mgmt_ie_buf, vndr_ie, vndr_ie_len);
+                        *mgmt_ie_len = vndr_ie_len;
+                        pos = 0;
+                        ie_buf = (u8 *) vndr_ie;
+                        delete = 0;
+                        while (pos < vndr_ie_len) {
+                                ie_id = ie_buf[pos++];
+                                ie_len = ie_buf[pos++];
+                                if ((ie_id == DOT11_MNG_VS_ID) &&
+                                   (wl_cfgp2p_is_wps_ie(&ie_buf[pos-2], NULL, 0) ||
+                                        wl_cfgp2p_is_p2p_ie(&ie_buf[pos-2], NULL, 0))) {
+                                        CFGP2P_INFO(("ADDED ID : %d, Len : %d , OUI :"
+                                                "%02x:%02x:%02x\n", ie_id, ie_len, ie_buf[pos],
+                                                ie_buf[pos+1], ie_buf[pos+2]));
+                                        ret = wl_cfgp2p_vndr_ie(ndev, bssidx, pktflag, ie_buf+pos,
+                                            VNDR_SPEC_ELEMENT_ID, ie_buf+pos+3, ie_len-3, delete);
+                                }
+                                pos += ie_len;
+                        }
+                }
+        }
+#undef IE_TYPE
+#undef IE_TYPE_LEN
+exit:
+        return ret;
+}
+
+/* Clear the manament IE buffer of BSSCFG
+ * Parameters:
+ * @wl       : wl_private data
+ * @bssidx   : bssidx for BSS
+ *
+ * Returns 0 if success.
+ */
+s32
+wl_cfgp2p_clear_management_ie(struct wl_priv *wl, s32 bssidx)
+{
+#define INIT_IE(IE_TYPE, BSS_TYPE)              \
+        do {                                                    \
+                memset(wl_to_p2p_bss_saved_ie(wl, BSS_TYPE).p2p_ ## IE_TYPE ## _ie, 0, \
+                   sizeof(wl_to_p2p_bss_saved_ie(wl, BSS_TYPE).p2p_ ## IE_TYPE ## _ie)); \
+                wl_to_p2p_bss_saved_ie(wl, BSS_TYPE).p2p_ ## IE_TYPE ## _ie_len = 0; \
+        } while (0);
+        if (bssidx < 0) {
+                CFGP2P_ERR(("invalid bssidx\n"));
+                return BCME_BADARG;
+        }
+        INIT_IE(probe_req, bssidx);
+        INIT_IE(probe_res, bssidx);
+        INIT_IE(assoc_req, bssidx);
+        INIT_IE(assoc_res, bssidx);
+        INIT_IE(beacon, bssidx);
+        return BCME_OK;
+}
+
+
+/* Is any of the tlvs the expected entry? If
+ * not update the tlvs buffer pointer/length.
+ */
+static bool
+wl_cfgp2p_has_ie(u8 *ie, u8 **tlvs, u32 *tlvs_len, const u8 *oui, u32 oui_len, u8 type)
+{
+        /* If the contents match the OUI and the type */
+        if (ie[TLV_LEN_OFF] >= oui_len + 1 &&
+                !bcmp(&ie[TLV_BODY_OFF], oui, oui_len) &&
+                type == ie[TLV_BODY_OFF + oui_len]) {
+                return TRUE;
+        }
+
+        if (tlvs == NULL)
+                return FALSE;
+        /* point to the next ie */
+        ie += ie[TLV_LEN_OFF] + TLV_HDR_LEN;
+        /* calculate the length of the rest of the buffer */
+        *tlvs_len -= (int)(ie - *tlvs);
+        /* update the pointer to the start of the buffer */
+        *tlvs = ie;
+
+        return FALSE;
+}
+
+wpa_ie_fixed_t *
+wl_cfgp2p_find_wpaie(u8 *parse, u32 len)
+{
+        bcm_tlv_t *ie;
+
+        while ((ie = bcm_parse_tlvs(parse, (u32)len, DOT11_MNG_VS_ID))) {
+                if (wl_cfgp2p_is_wpa_ie((u8*)ie, &parse, &len)) {
+                        return (wpa_ie_fixed_t *)ie;
+                }
+        }
+        return NULL;
+}
+
+wpa_ie_fixed_t *
+wl_cfgp2p_find_wpsie(u8 *parse, u32 len)
+{
+        bcm_tlv_t *ie;
+
+        while ((ie = bcm_parse_tlvs(parse, (u32)len, DOT11_MNG_VS_ID))) {
+                if (wl_cfgp2p_is_wps_ie((u8*)ie, &parse, &len)) {
+                        return (wpa_ie_fixed_t *)ie;
+                }
+        }
+        return NULL;
+}
+
+wifi_p2p_ie_t *
+wl_cfgp2p_find_p2pie(u8 *parse, u32 len)
+{
+        bcm_tlv_t *ie;
+
+        while ((ie = bcm_parse_tlvs(parse, (int)len, DOT11_MNG_VS_ID))) {
+                if (wl_cfgp2p_is_p2p_ie((uint8*)ie, &parse, &len)) {
+                        return (wifi_p2p_ie_t *)ie;
+                }
+        }
+        return NULL;
+}
+
+static s32
+wl_cfgp2p_vndr_ie(struct net_device *ndev, s32 bssidx, s32 pktflag,
+            s8 *oui, s32 ie_id, s8 *data, s32 data_len, s32 delete)
+{
+        s32 err = BCME_OK;
+        s32 buf_len;
+        s32 iecount;
+
+        vndr_ie_setbuf_t *ie_setbuf;
+
+        /* Validate the pktflag parameter */
+        if ((pktflag & ~(VNDR_IE_BEACON_FLAG | VNDR_IE_PRBRSP_FLAG |
+                    VNDR_IE_ASSOCRSP_FLAG | VNDR_IE_AUTHRSP_FLAG |
+                    VNDR_IE_PRBREQ_FLAG | VNDR_IE_ASSOCREQ_FLAG))) {
+                CFGP2P_ERR(("p2pwl_vndr_ie: Invalid packet flag 0x%x\n", pktflag));
+                return -1;
+        }
+
+        buf_len = sizeof(vndr_ie_setbuf_t) + data_len - 1;
+        ie_setbuf = (vndr_ie_setbuf_t *) kzalloc(buf_len, GFP_KERNEL);
+
+        CFGP2P_INFO((" ie_id : %02x, data length : %d\n", ie_id, data_len));
+        if (!ie_setbuf) {
+
+                CFGP2P_ERR(("Error allocating buffer for IE\n"));
+                return -ENOMEM;
+        }
+        if (delete)
+                strcpy(ie_setbuf->cmd, "del");
+        else
+                strcpy(ie_setbuf->cmd, "add");
+        /* Buffer contains only 1 IE */
+        iecount = htod32(1);
+        memcpy((void *)&ie_setbuf->vndr_ie_buffer.iecount, &iecount, sizeof(int));
+        pktflag = htod32(pktflag);
+        memcpy((void *)&ie_setbuf->vndr_ie_buffer.vndr_ie_list[0].pktflag,
+            &pktflag, sizeof(uint32));
+        ie_setbuf->vndr_ie_buffer.vndr_ie_list[0].vndr_ie_data.id = ie_id;
+        ie_setbuf->vndr_ie_buffer.vndr_ie_list[0].vndr_ie_data.len
+                = (uchar)(data_len + VNDR_IE_MIN_LEN);
+        memcpy(ie_setbuf->vndr_ie_buffer.vndr_ie_list[0].vndr_ie_data.oui, oui, 3);
+        memcpy(ie_setbuf->vndr_ie_buffer.vndr_ie_list[0].vndr_ie_data.data, data, data_len);
+        err = wldev_iovar_setbuf_bsscfg(ndev, "vndr_ie", ie_setbuf, buf_len,
+                ioctlbuf, sizeof(ioctlbuf), bssidx);
+
+        CFGP2P_INFO(("vndr_ie iovar returns %d\n", err));
+        kfree(ie_setbuf);
+        return err;
+}
+
+/*
+ * Search the bssidx based on dev argument
+ * Parameters:
+ * @wl       : wl_private data
+ * @ndev     : net device to search bssidx
+ *  Returns bssidx for ndev
+ */
+s32
+wl_cfgp2p_find_idx(struct wl_priv *wl, struct net_device *ndev)
+{
+        u32 i;
+        s32 index = -1;
+
+        if (ndev == NULL) {
+                CFGP2P_ERR((" ndev is NULL\n"));
+                goto exit;
+        }
+        if (!wl->p2p_supported) {
+                return P2PAPI_BSSCFG_PRIMARY;
+        }
+        for (i = 0; i < P2PAPI_BSSCFG_MAX; i++) {
+                if (ndev == wl_to_p2p_bss_ndev(wl, i)) {
+                        index = wl_to_p2p_bss_bssidx(wl, i);
+                        break;
+                }
+        }
+        if (index == -1)
+                return P2PAPI_BSSCFG_PRIMARY;
+exit:
+        return index;
+}
+/*
+ * Callback function for WLC_E_P2P_DISC_LISTEN_COMPLETE
+ */
+s32
+wl_cfgp2p_listen_complete(struct wl_priv *wl, struct net_device *ndev,
+            const wl_event_msg_t *e, void *data)
+{
+        s32 ret = BCME_OK;
+
+        CFGP2P_DBG((" Enter\n"));
+        if (wl_get_p2p_status(wl, LISTEN_EXPIRED) == 0) {
+                wl_set_p2p_status(wl, LISTEN_EXPIRED);
+                if (timer_pending(&wl->p2p->listen_timer)) {
+                        spin_lock_bh(&wl->p2p->timer_lock);
+                        del_timer_sync(&wl->p2p->listen_timer);
+                        spin_unlock_bh(&wl->p2p->timer_lock);
+                }
+                cfg80211_remain_on_channel_expired(ndev, wl->cache_cookie, &wl->remain_on_chan,
+                    wl->remain_on_chan_type, GFP_KERNEL);
+        } else
+                wl_clr_p2p_status(wl, LISTEN_EXPIRED);
+
+        return ret;
+
+}
+
+/*
+ *  Timer expire callback function for LISTEN
+ *  We can't report cfg80211_remain_on_channel_expired from Timer ISR context,
+ *  so lets do it from thread context.
+ */
+static void
+wl_cfgp2p_listen_expired(unsigned long data)
+{
+        wl_event_msg_t msg;
+        struct wl_priv *wl = (struct wl_priv *) data;
+
+        CFGP2P_DBG((" Enter\n"));
+        msg.event_type =  hton32(WLC_E_P2P_DISC_LISTEN_COMPLETE);
+        wl_cfg80211_event(wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_DEVICE), &msg, NULL);
+}
+
+/*
+ * Do a P2P Listen on the given channel for the given duration.
+ * A listen consists of sitting idle and responding to P2P probe requests
+ * with a P2P probe response.
+ *
+ * This fn assumes dongle p2p device discovery is already enabled.
+ * Parameters   :
+ * @wl          : wl_private data
+ * @channel     : channel to listen
+ * @duration_ms : the time (milli seconds) to wait
+ */
+s32
+wl_cfgp2p_discover_listen(struct wl_priv *wl, s32 channel, u32 duration_ms)
+{
+#define INIT_TIMER(timer, func, duration, extra_delay)  \
+        do {                   \
+                init_timer(timer); \
+                timer->function = func; \
+                timer->expires = jiffies + msecs_to_jiffies(duration + extra_delay); \
+                timer->data = (unsigned long) wl; \
+                add_timer(timer); \
+        } while (0);
+
+        s32 ret = BCME_OK;
+        struct timer_list *_timer;
+        CFGP2P_DBG((" Enter Channel : %d, Duration : %d\n", channel, duration_ms));
+        if (unlikely(wl_get_p2p_status(wl, DISCOVERY_ON) == 0)) {
+
+                CFGP2P_ERR((" Discovery is not set, so we have noting to do\n"));
+
+                ret = BCME_NOTREADY;
+                goto exit;
+        }
+        if (timer_pending(&wl->p2p->listen_timer)) {
+                CFGP2P_DBG(("previous LISTEN is not completed yet\n"));
+                goto exit;
+
+        } else
+                wl_clr_p2p_status(wl, LISTEN_EXPIRED);
+
+        wl_cfgp2p_set_p2p_mode(wl, WL_P2P_DISC_ST_LISTEN, channel, (u16) duration_ms,
+                    wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE));
+        _timer = &wl->p2p->listen_timer;
+
+        /*  We will wait to receive WLC_E_P2P_DISC_LISTEN_COMPLETE from dongle ,
+         *  otherwise we will wait up to duration_ms + 200ms
+         */
+        INIT_TIMER(_timer, wl_cfgp2p_listen_expired, duration_ms, 200);
+
+#undef INIT_TIMER
+exit:
+        return ret;
+}
+
+
+s32
+wl_cfgp2p_discover_enable_search(struct wl_priv *wl, u8 enable)
+{
+        s32 ret = BCME_OK;
+        CFGP2P_DBG((" Enter\n"));
+        if (!wl_get_p2p_status(wl, DISCOVERY_ON)) {
+
+                CFGP2P_DBG((" do nothing, discovery is off\n"));
+                return ret;
+        }
+        if (wl_get_p2p_status(wl, SEARCH_ENABLED) == enable) {
+                CFGP2P_DBG(("already : %d\n", enable));
+                return ret;
+        }
+
+        wl_chg_p2p_status(wl, SEARCH_ENABLED);
+        /* When disabling Search, reset the WL driver's p2p discovery state to
+         * WL_P2P_DISC_ST_SCAN.
+         */
+        if (!enable) {
+                wl_clr_p2p_status(wl, SCANNING);
+                ret = wl_cfgp2p_set_p2p_mode(wl, WL_P2P_DISC_ST_SCAN, 0, 0,
+                            wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE));
+        }
+
+        return ret;
+}
+
+/*
+ * Callback function for WLC_E_ACTION_FRAME_COMPLETE, WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE
+ */
+s32
+wl_cfgp2p_action_tx_complete(struct wl_priv *wl, struct net_device *ndev,
+            const wl_event_msg_t *e, void *data)
+{
+        s32 ret = BCME_OK;
+        u32 event_type = ntoh32(e->event_type);
+        u32 status = ntoh32(e->status);
+        CFGP2P_DBG((" Enter\n"));
+        if (event_type == WLC_E_ACTION_FRAME_COMPLETE) {
+
+                CFGP2P_INFO((" WLC_E_ACTION_FRAME_COMPLETE is received : %d\n", status));
+                if (status == WLC_E_STATUS_SUCCESS) {
+                        wl_set_p2p_status(wl, ACTION_TX_COMPLETED);
+                }
+                else {
+                        wl_set_p2p_status(wl, ACTION_TX_NOACK);
+                        CFGP2P_ERR(("WLC_E_ACTION_FRAME_COMPLETE : NO ACK\n"));
+                }
+                wake_up_interruptible(&wl->dongle_event_wait);
+        } else {
+                CFGP2P_INFO((" WLC_E_ACTION_FRAME_OFFCHAN_COMPLETE is received,"
+                                        "status : %d\n", status));
+        }
+        return ret;
+}
+/* Send an action frame immediately without doing channel synchronization.
+ *
+ * This function does not wait for a completion event before returning.
+ * The WLC_E_ACTION_FRAME_COMPLETE event will be received when the action
+ * frame is transmitted.
+ * The WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE event will be received when an
+ * 802.11 ack has been received for the sent action frame.
+ */
+s32
+wl_cfgp2p_tx_action_frame(struct wl_priv *wl, struct net_device *dev,
+        wl_af_params_t *af_params, s32 bssidx)
+{
+        s32 ret = BCME_OK;
+        s32 timeout = 0;
+
+
+        CFGP2P_INFO(("\n"));
+        CFGP2P_INFO(("channel : %u , dwell time : %u\n",
+            af_params->channel, af_params->dwell_time));
+
+        wl_clr_p2p_status(wl, ACTION_TX_COMPLETED);
+        wl_clr_p2p_status(wl, ACTION_TX_NOACK);
+#define MAX_WAIT_TIME 2000
+        if (bssidx == P2PAPI_BSSCFG_PRIMARY)
+                bssidx =  wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE);
+
+        ret = wldev_iovar_setbuf_bsscfg(dev, "actframe",
+                   af_params, sizeof(*af_params), ioctlbuf, sizeof(ioctlbuf), bssidx);
+
+        if (ret < 0) {
+
+                CFGP2P_ERR((" sending action frame is failed\n"));
+                goto exit;
+        }
+        timeout = wait_event_interruptible_timeout(wl->dongle_event_wait,
+        (wl_get_p2p_status(wl, ACTION_TX_COMPLETED) || wl_get_p2p_status(wl, ACTION_TX_NOACK)),
+        msecs_to_jiffies(MAX_WAIT_TIME));
+
+        if (timeout > 0 && wl_get_p2p_status(wl, ACTION_TX_COMPLETED)) {
+                CFGP2P_INFO(("tx action frame operation is completed\n"));
+                ret = BCME_OK;
+        } else {
+                ret = BCME_ERROR;
+                CFGP2P_INFO(("tx action frame operation is failed\n"));
+        }
+exit:
+        CFGP2P_INFO((" via act frame iovar : status = %d\n", ret));
+#undef MAX_WAIT_TIME
+        return ret;
+}
+
+/* Generate our P2P Device Address and P2P Interface Address from our primary
+ * MAC address.
+ */
+void
+wl_cfgp2p_generate_bss_mac(struct ether_addr *primary_addr,
+            struct ether_addr *out_dev_addr, struct ether_addr *out_int_addr)
+{
+        memset(out_dev_addr, 0, sizeof(*out_dev_addr));
+        memset(out_int_addr, 0, sizeof(*out_int_addr));
+
+        /* Generate the P2P Device Address.  This consists of the device's
+         * primary MAC address with the locally administered bit set.
+         */
+        memcpy(out_dev_addr, primary_addr, sizeof(*out_dev_addr));
+        out_dev_addr->octet[0] |= 0x02;
+
+        /* Generate the P2P Interface Address.  If the discovery and connection
+         * BSSCFGs need to simultaneously co-exist, then this address must be
+         * different from the P2P Device Address.
+         */
+        memcpy(out_int_addr, out_dev_addr, sizeof(*out_int_addr));
+        out_int_addr->octet[4] ^= 0x80;
+
+}
+
+/* P2P IF Address change to Virtual Interface MAC Address */
+void
+wl_cfg80211_change_ifaddr(u8* buf, struct ether_addr *p2p_int_addr, u8 element_id)
+{
+        wifi_p2p_ie_t *ie = (wifi_p2p_ie_t*) buf;
+        u16 len = ie->len;
+        u8 *subel;
+        u8 subelt_id;
+        u16 subelt_len;
+        CFGP2P_DBG((" Enter\n"));
+
+        /* Point subel to the P2P IE's subelt field.
+         * Subtract the preceding fields (id, len, OUI, oui_type) from the length.
+         */
+        subel = ie->subelts;
+        len -= 4;       /* exclude OUI + OUI_TYPE */
+
+        while (len >= 3) {
+        /* attribute id */
+                subelt_id = *subel;
+                subel += 1;
+                len -= 1;
+
+                /* 2-byte little endian */
+                subelt_len = *subel++;
+                subelt_len |= *subel++ << 8;
+
+                len -= 2;
+                len -= subelt_len;      /* for the remaining subelt fields */
+
+                if (subelt_id == element_id) {
+                        if (subelt_id == P2P_SEID_INTINTADDR) {
+                                memcpy(subel, p2p_int_addr->octet, ETHER_ADDR_LEN);
+                                CFGP2P_INFO(("Intended P2P Interface Address ATTR FOUND\n"));
+                        } else if (subelt_id == P2P_SEID_DEV_ID) {
+                                memcpy(subel, p2p_int_addr->octet, ETHER_ADDR_LEN);
+                                CFGP2P_INFO(("Device ID ATTR FOUND\n"));
+                        } else if (subelt_id == P2P_SEID_DEV_INFO) {
+                                memcpy(subel, p2p_int_addr->octet, ETHER_ADDR_LEN);
+                                CFGP2P_INFO(("Device INFO ATTR FOUND\n"));
+                        } else if (subelt_id == P2P_SEID_GROUP_ID) {
+                                memcpy(subel, p2p_int_addr->octet, ETHER_ADDR_LEN);
+                                CFGP2P_INFO(("GROUP ID ATTR FOUND\n"));
+                        }                       return;
+                } else {
+                        CFGP2P_DBG(("OTHER id : %d\n", subelt_id));
+                }
+                subel += subelt_len;
+        }
+}
+/*
+ * Check if a BSS is up.
+ * This is a common implementation called by most OSL implementations of
+ * p2posl_bss_isup().  DO NOT call this function directly from the
+ * common code -- call p2posl_bss_isup() instead to allow the OSL to
+ * override the common implementation if necessary.
+ */
+bool
+wl_cfgp2p_bss_isup(struct net_device *ndev, int bsscfg_idx)
+{
+        s32 result, val;
+        bool isup = false;
+        s8 getbuf[64];
+
+        /* Check if the BSS is up */
+        *(int*)getbuf = -1;
+        result = wldev_iovar_getbuf_bsscfg(ndev, "bss", &bsscfg_idx,
+                            sizeof(bsscfg_idx), getbuf, sizeof(getbuf), 0);
+        if (result != 0) {
+                CFGP2P_ERR(("'wl bss -C %d' failed: %d\n", bsscfg_idx, result));
+                CFGP2P_ERR(("NOTE: this ioctl error is normal "
+                                        "when the BSS has not been created yet.\n"));
+        } else {
+                val = *(int*)getbuf;
+                val = dtoh32(val);
+                CFGP2P_INFO(("---wl bss -C %d   ==> %d\n", bsscfg_idx, val));
+                isup = (val ? TRUE : FALSE);
+        }
+        return isup;
+}
+
+
+/* Bring up or down a BSS */
+s32
+wl_cfgp2p_bss(struct net_device *ndev, s32 bsscfg_idx, s32 up)
+{
+        s32 ret = BCME_OK;
+        s32 val = up ? 1 : 0;
+
+        struct {
+                s32 cfg;
+                s32 val;
+        } bss_setbuf;
+
+        bss_setbuf.cfg = htod32(bsscfg_idx);
+        bss_setbuf.val = htod32(val);
+        CFGP2P_INFO(("---wl bss -C %d %s\n", bsscfg_idx, up ? "up" : "down"));
+        ret = wldev_iovar_setbuf(ndev, "bss", &bss_setbuf, sizeof(bss_setbuf),
+                ioctlbuf, sizeof(ioctlbuf));
+
+        if (ret != 0) {
+                CFGP2P_ERR(("'bss %d' failed with %d\n", up, ret));
+        }
+
+        return ret;
+}
+
+/* Check if 'p2p' is supported in the driver */
+s32
+wl_cfgp2p_supported(struct wl_priv *wl, struct net_device *ndev)
+{
+        s32 ret = BCME_OK;
+        s32 p2p_supported = 0;
+        ret = wldev_iovar_getint(ndev, "p2p",
+                       &p2p_supported);
+        if (ret < 0) {
+                CFGP2P_ERR(("wl p2p error %d\n", ret));
+                return 0;
+        }
+        if (p2p_supported == 1) {
+                CFGP2P_INFO(("p2p is supported\n"));
+        } else {
+                CFGP2P_INFO(("p2p is unsupported\n"));
+                p2p_supported = 0;
+        }
+        return p2p_supported;
+}
+
+/* Cleanup P2P resources */
+s32
+wl_cfgp2p_down(struct wl_priv *wl)
+{
+        if (timer_pending(&wl->p2p->listen_timer))
+                del_timer_sync(&wl->p2p->listen_timer);
+        wl_cfgp2p_deinit_priv(wl);
+        return 0;
+}
+
+s32 wl_cfgp2p_set_p2p_noa(struct wl_priv *wl, struct net_device *ndev, char* buf, int len)
+{
+        s32 ret = -1;
+        int count, start, duration;
+        wl_p2p_sched_t dongle_noa;
+
+        CFGP2P_DBG((" Enter\n"));
+
+        memset(&dongle_noa, 0, sizeof(dongle_noa));
+
+        if (wl->p2p && wl->p2p->vif_created) {
+
+                wl->p2p->noa.desc[0].start = 0;
+
+                sscanf(buf, "%d %d %d", &count, &start, &duration);
+                CFGP2P_DBG(("set_p2p_noa count %d start %d duration %d\n",
+                                count, start, duration));
+                if (count != -1)
+                        wl->p2p->noa.desc[0].count = count;
+
+                /* supplicant gives interval as start */
+                if (start != -1)
+                        wl->p2p->noa.desc[0].interval = start;
+
+                if (duration != -1)
+                        wl->p2p->noa.desc[0].duration = duration;
+
+                if (wl->p2p->noa.desc[0].count != 255) {
+                        wl->p2p->noa.desc[0].start = 200;
+                        dongle_noa.type = WL_P2P_SCHED_TYPE_REQ_ABS;
+                        dongle_noa.action = WL_P2P_SCHED_ACTION_GOOFF;
+                        dongle_noa.option = WL_P2P_SCHED_OPTION_TSFOFS;
+                }
+                else {
+                        /* Continuous NoA interval. */
+                        dongle_noa.action = WL_P2P_SCHED_ACTION_NONE;
+                        dongle_noa.type = WL_P2P_SCHED_TYPE_ABS;
+                        if ((wl->p2p->noa.desc[0].interval == 102) ||
+                                (wl->p2p->noa.desc[0].interval == 100)) {
+                                wl->p2p->noa.desc[0].start = 100 -
+                                        wl->p2p->noa.desc[0].duration;
+                                dongle_noa.option = WL_P2P_SCHED_OPTION_BCNPCT;
+                        }
+                        else {
+                                dongle_noa.option = WL_P2P_SCHED_OPTION_NORMAL;
+                        }
+                }
+                /* Put the noa descriptor in dongle format for dongle */
+                dongle_noa.desc[0].count = htod32(wl->p2p->noa.desc[0].count);
+                if (dongle_noa.option == WL_P2P_SCHED_OPTION_BCNPCT) {
+                        dongle_noa.desc[0].start = htod32(wl->p2p->noa.desc[0].start);
+                        dongle_noa.desc[0].duration = htod32(wl->p2p->noa.desc[0].duration);
+                }
+                else {
+                        dongle_noa.desc[0].start = htod32(wl->p2p->noa.desc[0].start*1000);
+                        dongle_noa.desc[0].duration = htod32(wl->p2p->noa.desc[0].duration*1000);
+                }
+                dongle_noa.desc[0].interval = htod32(wl->p2p->noa.desc[0].interval*1000);
+
+                ret = wldev_iovar_setbuf(wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION),
+                        "p2p_noa", &dongle_noa, sizeof(dongle_noa), ioctlbuf, sizeof(ioctlbuf));
+
+                if (ret < 0) {
+                        CFGP2P_ERR(("fw set p2p_noa failed %d\n", ret));
+                }
+        }
+        else {
+                CFGP2P_ERR(("ERROR: set_noa in non-p2p mode\n"));
+        }
+        return ret;
+}
+
+s32 wl_cfgp2p_get_p2p_noa(struct wl_priv *wl, struct net_device *ndev, char* buf, int buf_len)
+{
+        wifi_p2p_noa_desc_t *noa_desc;
+        int len = 0, i;
+        char _buf[200];
+
+        CFGP2P_DBG((" Enter\n"));
+        buf[0] = '\0';
+        if (wl->p2p && wl->p2p->vif_created) {
+                if (wl->p2p->noa.desc[0].count || wl->p2p->ops.ops) {
+                        _buf[0] = 1; /* noa index */
+                        _buf[1] = (wl->p2p->ops.ops ? 0x80: 0) |
+                                (wl->p2p->ops.ctw & 0x7f); /* ops + ctw */
+                        len += 2;
+                        if (wl->p2p->noa.desc[0].count) {
+                                noa_desc = (wifi_p2p_noa_desc_t*)&_buf[len];
+                                noa_desc->cnt_type = wl->p2p->noa.desc[0].count;
+                                noa_desc->duration = wl->p2p->noa.desc[0].duration;
+                                noa_desc->interval = wl->p2p->noa.desc[0].interval;
+                                noa_desc->start = wl->p2p->noa.desc[0].start;
+                                len += sizeof(wifi_p2p_noa_desc_t);
+                        }
+                        if (buf_len <= len * 2) {
+                                CFGP2P_ERR(("ERROR: buf_len %d in not enough for"
+                                        "returning noa in string format\n", buf_len));
+                                return -1;
+                        }
+                        /* We have to convert the buffer data into ASCII strings */
+                        for (i = 0; i < len; i++) {
+                                sprintf(buf, "%02x", _buf[i]);
+                                buf += 2;
+                        }
+                        buf[i*2] = '\0';
+                }
+        }
+        else {
+                CFGP2P_ERR(("ERROR: get_noa in non-p2p mode\n"));
+                return -1;
+        }
+        return len * 2;
+}
+
+s32 wl_cfgp2p_set_p2p_ps(struct wl_priv *wl, struct net_device *ndev, char* buf, int len)
+{
+        int ps, ctw;
+        int ret = -1;
+        s32 legacy_ps;
+
+        CFGP2P_DBG((" Enter\n"));
+        if (wl->p2p && wl->p2p->vif_created) {
+                sscanf(buf, "%d %d %d", &legacy_ps, &ps, &ctw);
+                CFGP2P_DBG((" Enter legacy_ps %d ps %d ctw %d\n", legacy_ps, ps, ctw));
+                if (ctw != -1) {
+                        wl->p2p->ops.ctw = ctw;
+                        ret = 0;
+                }
+                if (ps != -1) {
+                        wl->p2p->ops.ops = ps;
+                        ret = wldev_iovar_setbuf(wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION),
+                                "p2p_ops", &wl->p2p->ops, sizeof(wl->p2p->ops),
+                                ioctlbuf, sizeof(ioctlbuf));
+                        if (ret < 0) {
+                                CFGP2P_ERR(("fw set p2p_ops failed %d\n", ret));
+                        }
+                }
+
+                if (legacy_ps != -1) {
+                        s32 pm = legacy_ps ? PM_MAX : PM_OFF;
+                        ret = wldev_ioctl(wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION),
+                                WLC_SET_PM, &pm, sizeof(pm), true);
+                        if (unlikely(ret)) {
+                                CFGP2P_ERR(("error (%d)\n", ret));
+                        }
+                }
+        }
+        else {
+                CFGP2P_ERR(("ERROR: set_p2p_ps in non-p2p mode\n"));
+                ret = -1;
+        }
+        return ret;
+}