jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P: Clean up Listen channel optimization debug prints

Browse source 
Do not claim to change the Listen channel in a debug message when
previously configured channel prevents this. In addition, fix a typo in
another related debug print.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-02-03 16:13:35 +02:00 committed by Jouni Malinen
parent 2e6085c27b
commit abe96d0605
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/p2p/p2p.c
View file

@ -4557,15 +4557,18 @@ int p2p_set_listen_channel(struct p2p_data *p2p, u8 reg_class, u8 channel,
if (p2p_channel_to_freq(reg_class, channel) < 0)
return -1;
p2p_dbg(p2p, "Set Listen channel: reg_class %u channel %u",
reg_class, channel);
/*
* Listen channel was set in configuration or set by control interface;
* cannot override it.
*/
if (p2p->cfg->channel_forced && forced == 0)
if (p2p->cfg->channel_forced && forced == 0) {
p2p_dbg(p2p,
"Listen channel was previously configured - do not override based on optimization");
return -1;
}
p2p_dbg(p2p, "Set Listen channel: reg_class %u channel %u",
reg_class, channel);
if (p2p->state == P2P_IDLE) {
p2p->cfg->reg_class = reg_class;

2
wpa_supplicant/p2p_supplicant.c
View file

@ -9167,7 +9167,7 @@ static void wpas_p2p_optimize_listen_channel(struct wpa_supplicant *wpa_s,
if (cand) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Update Listen channel to %u baased on operating channel",
"P2P: Update Listen channel to %u based on operating channel",
cand);
p2p_set_listen_channel(wpa_s->global->p2p, 81, cand, 0);
}