diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-07-16 09:55:28 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-07-16 17:07:36 +0000 |
| commit | 2e67f06149ff649fb6f8782bad041d3d9124685e (patch) | |
| tree | 0fb28cadf2160ac5d6cad5a79135a0b61df0b7a0 /src/drivers | |
| parent | 2f9ffba33e8d57edccf0932cc0b1f8f3bbe77c54 (diff) | |
| download | android_external_wpa_supplicant_8-2e67f06149ff649fb6f8782bad041d3d9124685e.tar.gz android_external_wpa_supplicant_8-2e67f06149ff649fb6f8782bad041d3d9124685e.tar.bz2 android_external_wpa_supplicant_8-2e67f06149ff649fb6f8782bad041d3d9124685e.zip | |
Cumulative patch from commit 6d00ab04302df257cb3092b2b31b4eac42e77569
6d00ab0 nl80211: Ensure nl_preq unregistration on driver deinit
71a0e39 P2P: Make unrecognized vendor elements available in P2P_PEER
86bd36f Add generic mechanism for adding vendor elements into frames
Change-Id: I392072a37d8dbfc92769082b60f052f7095466b6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/driver_nl80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 4d5da949..683123b1 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -10566,7 +10566,7 @@ static int wpa_driver_nl80211_probe_req_report(struct i802_bss *bss, int report) if (!report) { if (bss->nl_preq && drv->device_ap_sme && - is_ap_interface(drv->nlmode)) { + is_ap_interface(drv->nlmode) && !bss->in_deinit) { /* * Do not disable Probe Request reporting that was * enabled in nl80211_setup_ap(). |