Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
external_wpa_supplicant_8
Commits
5e431528
Commit
5e431528
authored
12 years ago
by
Irfan Sheriff
Committed by
Android (Google) Code Review
12 years ago
Browse files
Options
Download
Plain Diff
Merge "Use bssid instead of pending_bssid" into jb-mr1-dev
parents
ff2bda64
e78e767a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
wpa_supplicant/ctrl_iface.c
wpa_supplicant/ctrl_iface.c
+1
-1
wpa_supplicant/notify.c
wpa_supplicant/notify.c
+1
-1
No files found.
wpa_supplicant/ctrl_iface.c
View file @
5e431528
...
...
@@ -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
)
:
""
);
...
...
This diff is collapsed.
Click to expand it.
wpa_supplicant/notify.c
View file @
5e431528
...
...
@@ -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
)
:
""
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment