diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-08-01 13:01:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-01 13:01:40 -0700 |
| commit | 5e4315286bf0aa8a42495674f14e1cefedeeb4ec (patch) | |
| tree | 4d7f18f96959577630da786f23a3dd2bad9bb583 /wpa_supplicant | |
| parent | ff2bda64334bb7dcc98816e4ac4b515cd2a9667b (diff) | |
| parent | e78e767aea5576ec0ba7edadfe25fd9dc7dce48f (diff) | |
| download | external_wpa_supplicant_8-5e4315286bf0aa8a42495674f14e1cefedeeb4ec.zip external_wpa_supplicant_8-5e4315286bf0aa8a42495674f14e1cefedeeb4ec.tar.gz external_wpa_supplicant_8-5e4315286bf0aa8a42495674f14e1cefedeeb4ec.tar.bz2 | |
Merge "Use bssid instead of pending_bssid" into jb-mr1-dev
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 2 | ||||
| -rw-r--r-- | wpa_supplicant/notify.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 2224738..82d26e3 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -1146,7 +1146,7 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s, "id=%d state=%d BSSID=" MACSTR " SSID=%s", wpa_s->current_ssid ? wpa_s->current_ssid->id : -1, wpa_s->wpa_state, - MAC2STR(wpa_s->pending_bssid), + MAC2STR(wpa_s->bssid), wpa_s->current_ssid && wpa_s->current_ssid->ssid ? wpa_ssid_txt(wpa_s->current_ssid->ssid, wpa_s->current_ssid->ssid_len) : ""); diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index 59e6975..770907c 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -93,7 +93,7 @@ void wpas_notify_state_changed(struct wpa_supplicant *wpa_s, "id=%d state=%d BSSID=" MACSTR " SSID=%s", wpa_s->current_ssid ? wpa_s->current_ssid->id : -1, new_state, - MAC2STR(wpa_s->pending_bssid), + MAC2STR(wpa_s->bssid), wpa_s->current_ssid && wpa_s->current_ssid->ssid ? wpa_ssid_txt(wpa_s->current_ssid->ssid, wpa_s->current_ssid->ssid_len): ""); |