diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-04-24 12:57:01 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-04-24 12:57:01 -0700 |
| commit | 8da800a193fb6f8832218715f82a7b4e2d2ad338 (patch) | |
| tree | f41eaa6909b85c49449e1b02385b9af9a09348f7 /src/eapol_supp | |
| parent | 2a96702ab0ec3e15ac53558a051c393d66c1c51e (diff) | |
| download | android_external_wpa_supplicant_8-8da800a193fb6f8832218715f82a7b4e2d2ad338.tar.gz android_external_wpa_supplicant_8-8da800a193fb6f8832218715f82a7b4e2d2ad338.tar.bz2 android_external_wpa_supplicant_8-8da800a193fb6f8832218715f82a7b4e2d2ad338.zip | |
Accumulative patch from commit 97279d8d1ad40bd7d884af8e2fc26dff0163331a
97279d8 nl80211: Drop frame events that are for foreign address
cc2ada8 nl80211: Reduce debug on Probe Request frames
63a965c P2P: Fix after_scan_tx processing during ongoing operations
06b7f58 RSN: Update preauth scan results only based on new scan results
18e00b5 Move wpa_s freeing into wpa_supplicant_deinit_iface()
754632c dbus_new: Add EAP logon/logoff
c2aff6b hostapd: Add some testing options
adc96dc nl80211: Fix nla_nest_start conversion
0606052 wpa_supplicant: Add get_capability freq
c7a39ba Provide TLS alerts to CLI/UI over control interface
2a07a27 P2P: Increase GTK rekeying period to 24 hours
75fa7d1 TDLS: Fix key configuration with current mac80211
8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested
Change-Id: Ic4b568c341657d266b7759513230d4ef206d75b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/eapol_supp')
| -rw-r--r-- | src/eapol_supp/eapol_supp_sm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/eapol_supp/eapol_supp_sm.c b/src/eapol_supp/eapol_supp_sm.c index 2e560865..9b054fcd 100644 --- a/src/eapol_supp/eapol_supp_sm.c +++ b/src/eapol_supp/eapol_supp_sm.c @@ -1533,6 +1533,10 @@ void eapol_sm_notify_logoff(struct eapol_sm *sm, Boolean logoff) { if (sm) { sm->userLogoff = logoff; + if (!logoff) { + /* If there is a delayed txStart queued, start now. */ + sm->startWhen = 0; + } eapol_sm_step(sm); } } |