diff options
| author | Andrew Dodd <atd7@cornell.edu> | 2012-12-13 00:37:26 -0500 |
|---|---|---|
| committer | Andrew Dodd <atd7@cornell.edu> | 2012-12-15 01:20:58 -0500 |
| commit | 261a70c1fedbfe818956f78aae9c677f4e0fbe7b (patch) | |
| tree | 1fae8263cd5017277e87a588c865d16bb877a3e4 /wpa_supplicant/wpa_supplicant.c | |
| parent | 279731e733c27fd8dfb24d740c05f9ba1b4f8db0 (diff) | |
| download | external_wpa_supplicant_8-261a70c1fedbfe818956f78aae9c677f4e0fbe7b.zip external_wpa_supplicant_8-261a70c1fedbfe818956f78aae9c677f4e0fbe7b.tar.gz external_wpa_supplicant_8-261a70c1fedbfe818956f78aae9c677f4e0fbe7b.tar.bz2 | |
Use legacy NL80211 STA events for older drivers
This allows tethering on devices with older bcmdhd
drivers to be fixed. It conditionally reverts
b638fe75d3cb9d21c67386173f10afe65053cc4d
"nl80211: Use native cfg80211 sta events" for these
boards.
Use BOARD_LEGACY_NL80211_STA_EVENTS to enable
this conditional revert.
Forward-port to JB MR1, squashed in Steve Kondik's commit
to handle additional changes.
Change-Id: I4e436c57819944515455725cfd7ac7eeb31552ca
Diffstat (limited to 'wpa_supplicant/wpa_supplicant.c')
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index d8f3c44..a54239f 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -647,9 +647,14 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, wpa_supplicant_state_txt(state)); #ifdef ANDROID_P2P +#ifdef LEGACY_STA_EVENTS + if(state == WPA_ASSOCIATED || (state <= WPA_INACTIVE)) + wpa_s->assoc_retries = 0; +#else if(state == WPA_ASSOCIATED && wpa_s->current_ssid) { wpa_s->current_ssid->assoc_retry = 0; } +#endif #endif /* ANDROID_P2P */ if (state != WPA_SCANNING) |