From 261a70c1fedbfe818956f78aae9c677f4e0fbe7b Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Thu, 13 Dec 2012 00:37:26 -0500 Subject: 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 --- wpa_supplicant/wpa_supplicant.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'wpa_supplicant/wpa_supplicant.c') 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) -- cgit v1.1