From abe96d0605bee2686fd9c346fde74c8b3621a11e Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 3 Feb 2015 16:13:35 +0200 Subject: [PATCH] P2P: Clean up Listen channel optimization debug prints 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 --- src/p2p/p2p.c | 11 +++++++---- wpa_supplicant/p2p_supplicant.c | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 4797a0182..2fcef6bc7 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -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; diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index d715af1aa..9e1d66568 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -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); }