diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-02 18:26:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-02 18:26:58 -0700 |
| commit | baed5e5217a54044e21c7a4321aaa21f8dbfd9b9 (patch) | |
| tree | c7cbc4fa7703c66f32ca5b097ecf72a9713ad30b | |
| parent | 4dc94b992cf28c399e5e78c45eaa1cbfb7d43cfb (diff) | |
| parent | a9b19586456fd9ff4b502a7f07d65cacf092b34d (diff) | |
| download | android_external_wpa_supplicant_8-baed5e5217a54044e21c7a4321aaa21f8dbfd9b9.tar.gz android_external_wpa_supplicant_8-baed5e5217a54044e21c7a4321aaa21f8dbfd9b9.tar.bz2 android_external_wpa_supplicant_8-baed5e5217a54044e21c7a4321aaa21f8dbfd9b9.zip | |
Merge "Set GTK rekey offload information after initial group key handshake"
| -rw-r--r-- | src/rsn_supp/wpa.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index e50404ce..ce3f3180 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -1132,7 +1132,8 @@ static void wpa_supplicant_process_3_of_4(struct wpa_sm *sm, goto failed; } - wpa_sm_set_rekey_offload(sm); + if (ie.gtk) + wpa_sm_set_rekey_offload(sm); return; @@ -1353,13 +1354,14 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, MAC2STR(sm->bssid), wpa_cipher_txt(sm->group_cipher)); wpa_sm_cancel_auth_timeout(sm); wpa_sm_set_state(sm, WPA_COMPLETED); - - wpa_sm_set_rekey_offload(sm); } else { wpa_supplicant_key_neg_complete(sm, sm->bssid, key_info & WPA_KEY_INFO_SECURE); } + + wpa_sm_set_rekey_offload(sm); + return; failed: |