aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-09-04 17:04:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-04 17:04:57 -0700
commit1c1426e0af4c7d688bc5f8e269ec4a46782c8fa8 (patch)
treea750f504d71992f1f0d81f4db5e26ea125592d5c
parent59d1b4715764a72184298e1c907ba2b3be5bb5a3 (diff)
parentcef482f830a787f249e7719ffb7d45db19ba1feb (diff)
downloadexternal_wpa_supplicant_8-1c1426e0af4c7d688bc5f8e269ec4a46782c8fa8.zip
external_wpa_supplicant_8-1c1426e0af4c7d688bc5f8e269ec4a46782c8fa8.tar.gz
external_wpa_supplicant_8-1c1426e0af4c7d688bc5f8e269ec4a46782c8fa8.tar.bz2
am cef482f8: am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick
* commit 'cef482f830a787f249e7719ffb7d45db19ba1feb': Fix 'restore STA reconnection behavior' cherry-pick
-rw-r--r--wpa_supplicant/config_ssid.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index 59ec309..9fc3219 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -450,6 +450,13 @@ struct wpa_ssid {
int assoc_retry;
#endif
+#ifdef ANDROID_P2P
+ /**
+ * assoc_retry - Number of times association should be retried.
+ */
+ int assoc_retry;
+#endif
+
#ifdef CONFIG_HT_OVERRIDES
/**
* disable_ht - Disable HT (IEEE 802.11n) for this network