commit 33077b18208aab987e14cd26f0f501c7666a89ff
author Jouni Malinen <jouni@qca.qualcomm.com> Wed Feb 27 07:46:44 2013 -0800
committer Irfan Sheriff <isheriff@google.com> Wed Feb 27 07:48:17 2013 -0800
tree 5ca80e19a904d757145d96ff0d0e3899cf5f5b09
parent f86232838cf712377867cb42417c1613ab5dc425

P2P: Fix GO Probe Response IEs when Wi-Fi Display is enabled

Commit 1a9f6509b3a711071c12006ff7c3a9cb2a6691f2 added support for
fragmenting the P2P IE in Probe Response frames from a GO. However, it
did not take into account the possibility of Wi-Fi Display IE being
included in the same buffer and caused a regression for the cases where
Wi-Fi Display is enabled. Fix this by building the possibly fragmented
P2P IE first and then concatenating the separate IEs together.

Bug: 8225922
Change-Id: I3c11c4558506f2324f883bb555f025b535b9e40e