aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-09-04 17:21:12 -0700
committerDmitry Shmidt <dimitrysh@google.com>2012-09-04 17:21:12 -0700
commit286cca548b36080e8bddef5dd4a8e4b17e78881c (patch)
tree56d3901391d15e20a1687020de3f36ad04221826 /wpa_supplicant
parent1c1426e0af4c7d688bc5f8e269ec4a46782c8fa8 (diff)
downloadexternal_wpa_supplicant_8-286cca548b36080e8bddef5dd4a8e4b17e78881c.zip
external_wpa_supplicant_8-286cca548b36080e8bddef5dd4a8e4b17e78881c.tar.gz
external_wpa_supplicant_8-286cca548b36080e8bddef5dd4a8e4b17e78881c.tar.bz2
Fix am cef482f8: merge
Change-Id: I47a4610b40092d81a4d62e53a26924c4f9d05a17 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/config_ssid.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index 9fc3219..0863607 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -443,12 +443,6 @@ struct wpa_ssid {
* WPS or similar so that they may be exported.
*/
int export_keys;
-#ifdef ANDROID_P2P
- /**
- * assoc_retry - Number of times association should be retried.
- */
- int assoc_retry;
-#endif
#ifdef ANDROID_P2P
/**