diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2015-05-19 11:02:01 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2015-05-19 11:02:01 -0700 |
| commit | 05df46a3aef489a33f92efb91b091c1aa6d16f95 (patch) | |
| tree | 44c3ba39c4e867825b363989b585b5a3e0abd01e /src/p2p/p2p.c | |
| parent | cc00d5dc8483e32158b2ba61ea44b0c38d790ed7 (diff) | |
| download | wpa_supplicant_8-05df46a3aef489a33f92efb91b091c1aa6d16f95.tar.gz | |
Cumulative patch from commit 9b05135aa477f2c64d08bdb99062907cf767c1ea
9b05135 P2P: Fix association with an AP/P2P GO that is not a P2P manager
8884ce0 hostapd: check validity of cwMin/cwMax values
9649b53 vlan: Print libnl error message on vlan_add / vlan_del
279724d Add QCA vendor subcmd for Link Property Query
Change-Id: I33606ae68e16c8eb07473add034c7bca5aa6e153
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/p2p/p2p.c')
| -rw-r--r-- | src/p2p/p2p.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index a45fe73b..c02044b1 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2485,10 +2485,21 @@ static int p2p_assoc_req_ie_wlan_ap(struct p2p_data *p2p, const u8 *bssid, size_t tmplen; int res; u8 group_capab; + struct p2p_message msg; if (p2p_ie == NULL) return 0; /* WLAN AP is not a P2P manager */ + os_memset(&msg, 0, sizeof(msg)); + if (p2p_parse_p2p_ie(p2p_ie, &msg) < 0) + return 0; + + p2p_dbg(p2p, "BSS P2P manageability %s", + msg.manageability ? "enabled" : "disabled"); + + if (!msg.manageability) + return 0; + /* * (Re)Association Request - P2P IE * P2P Capability attribute (shall be present) |