diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2015-01-27 13:40:23 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2015-01-28 14:12:43 -0800 |
| commit | 807291d85bf857320aff6a8ade38c5f622ab9df8 (patch) | |
| tree | 7ddeb2e936e41a828ec012cc5265e1b55541dbaa /src/p2p | |
| parent | 2f74e36e84064ffa32f82f3decf36b653c7e4fad (diff) | |
| download | android_external_wpa_supplicant_8-807291d85bf857320aff6a8ade38c5f622ab9df8.tar.gz android_external_wpa_supplicant_8-807291d85bf857320aff6a8ade38c5f622ab9df8.tar.bz2 android_external_wpa_supplicant_8-807291d85bf857320aff6a8ade38c5f622ab9df8.zip | |
Cumulative patch from commit 3f56a2b7460a57a2b68b48b936be134bf04aa36d (DO NOT MERGE)
3f56a2b Ignore pmf=1 default if driver does not support PMF
fa38860 nl80211: Fix build with libnl 1.1
937403b Update copyright notices for the new year 2015
399e613 Add Suite B AKMs to key_mgmt capability list
5e3b519 Add Suite B 192-bit AKM
97ae35a Add HMAC-SHA384
98cd3d1 Preparations for variable length KCK and KEK
30bff1d Extend AES-CMAC routines to support 256-bit keys
86f9b1c nl80211: Fix default group key management index configuration
b5f045d Show supported group_mgmt capabilities
893e152 Interworking: More debug messages
f45bae5 Interworking: Add logging to track nai_realm_find_eap failures
5a5aab7 Interworking: Remove unnecessary NULL check
400de9b hostapd: Debug messages for dodgy RADIUS servers
ad905e4 wpa_gui: Sort frequency and signal numerically in the scan results dialog
c35e35e Add passive_scan configuration parameter
bff162a P2P: Fix NULL pointer dereference with SD query cancellation
630b323 nl80211: Increase netlink receive buffer size
Change-Id: I32d4bd934ad76e24c646e9925bb839b1ba2a148e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index fc610819..f3e31a80 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2847,7 +2847,7 @@ static void p2p_sd_cb(struct p2p_data *p2p, int success) return; } - if (p2p->sd_query->for_all_peers) { + if (p2p->sd_query && p2p->sd_query->for_all_peers) { /* Update the pending broadcast SD query count for this device */ p2p->sd_peer->sd_pending_bcast_queries--; |