2 files changed, 37 insertions, 6 deletions

diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
index 38c81cf94f4..8fcc13c4d30 100644
--- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
@@ -1830,6 +1830,38 @@ wl_cfgp2p_retreive_p2pattrib(void *buf, u8 element_id)
 }
 
 #define P2P_GROUP_CAPAB_GO_BIT  0x01
+
+u8*
+wl_cfgp2p_find_attrib_in_all_p2p_Ies(u8 *parse, u32 len, u32 attrib)
+{
+        bcm_tlv_t *ie;
+        u8* pAttrib;
+
+        CFGP2P_INFO(("Starting parsing parse %p attrib %d remaining len %d ", parse, attrib, len));
+        while ((ie = bcm_parse_tlvs(parse, (int)len, DOT11_MNG_VS_ID))) {
+                if (wl_cfgp2p_is_p2p_ie((uint8*)ie, &parse, &len) == TRUE) {
+                        /* Have the P2p ie. Now check for attribute */
+                        if ((pAttrib = wl_cfgp2p_retreive_p2pattrib(parse, attrib)) != NULL) {
+                                CFGP2P_INFO(("P2P attribute %d was found at parse %p",
+                                        attrib, parse));
+                                return pAttrib;
+                        }
+                        else {
+                                parse += (ie->len + TLV_HDR_LEN);
+                                len -= (ie->len + TLV_HDR_LEN);
+                                CFGP2P_INFO(("P2P Attribute %d not found Moving parse"
+                                        " to %p len to %d", attrib, parse, len));
+                        }
+                }
+                else {
+                        /* It was not p2p IE. parse will get updated automatically to next TLV */
+                        CFGP2P_INFO(("IT was NOT P2P IE parse %p len %d", parse, len));
+                }
+        }
+        CFGP2P_ERR(("P2P attribute %d was NOT found", attrib));
+        return NULL;
+}
+
 u8 *
 wl_cfgp2p_retreive_p2p_dev_addr(wl_bss_info_t *bi, u32 bi_length)
 {
@@ -1838,12 +1870,8 @@ wl_cfgp2p_retreive_p2p_dev_addr(wl_bss_info_t *bi, u32 bi_length)
         bool p2p_go     = 0;
         u8 *ptr = NULL;
 
-        if (!(p2p_ie = wl_cfgp2p_find_p2pie(((u8 *) bi) + bi->ie_offset, bi->ie_length))) {
-                WL_ERR(("P2P IE not found"));
-                return NULL;
-        }
-
-        if (!(capability = wl_cfgp2p_retreive_p2pattrib(p2p_ie, P2P_SEID_P2P_INFO))) {
+        if ((capability = wl_cfgp2p_find_attrib_in_all_p2p_Ies(((u8 *) bi) + bi->ie_offset,
+                bi->ie_length, P2P_SEID_P2P_INFO)) == NULL) {
                 WL_ERR(("P2P Capability attribute not found"));
                 return NULL;
         }
diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.h b/drivers/net/wireless/bcmdhd/wl_cfgp2p.h
index 03a645aea31..be5ddba73a4 100644
--- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.h
+++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.h
@@ -254,6 +254,9 @@ wl_cfgp2p_set_p2p_ps(struct wl_priv *wl, struct net_device *ndev, char* buf, int
 extern u8 *
 wl_cfgp2p_retreive_p2pattrib(void *buf, u8 element_id);
 
+extern u8*
+wl_cfgp2p_find_attrib_in_all_p2p_Ies(u8 *parse, u32 len, u32 attrib);
+
 extern u8 *
 wl_cfgp2p_retreive_p2p_dev_addr(wl_bss_info_t *bi, u32 bi_length);