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

P2P: Add more debug info on operating channel selection

Browse source 
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-08-26 14:08:03 +03:00 committed by Jouni Malinen
parent 8d660e04e9
commit 99d7c76294
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p2p/p2p.c
View file

@ -1133,6 +1133,8 @@ static int p2p_prepare_channel_pref(struct p2p_data *p2p,
u8 op_class, op_channel;
unsigned int freq = force_freq ? force_freq : pref_freq;
p2p_dbg(p2p, "Prepare channel pref - force_freq=%u pref_freq=%u",
force_freq, pref_freq);
if (p2p_freq_to_channel(freq, &op_class, &op_channel) < 0) {
p2p_dbg(p2p, "Unsupported frequency %u MHz", freq);
return -1;
@ -1165,6 +1167,8 @@ static void p2p_prepare_channel_best(struct p2p_data *p2p)
{
u8 op_class, op_channel;
p2p_dbg(p2p, "Prepare channel best");
if (!p2p->cfg->cfg_op_channel && p2p->best_freq_overall > 0 &&
p2p_supported_freq(p2p, p2p->best_freq_overall) &&
p2p_freq_to_channel(p2p->best_freq_overall, &op_class, &op_channel)
@ -1187,6 +1191,7 @@ static void p2p_prepare_channel_best(struct p2p_data *p2p)
p2p->op_reg_class = op_class;
p2p->op_channel = op_channel;
} else {
p2p_dbg(p2p, "Select pre-configured channel as operating channel preference");
p2p->op_reg_class = p2p->cfg->op_reg_class;
p2p->op_channel = p2p->cfg->op_channel;
}
@ -1212,6 +1217,8 @@ static void p2p_prepare_channel_best(struct p2p_data *p2p)
int p2p_prepare_channel(struct p2p_data *p2p, struct p2p_device *dev,
unsigned int force_freq, unsigned int pref_freq)
{
p2p_dbg(p2p, "Prepare channel - force_freq=%u pref_freq=%u",
force_freq, pref_freq);
if (force_freq || pref_freq) {
if (p2p_prepare_channel_pref(p2p, force_freq, pref_freq) < 0)
return -1;

3
wpa_supplicant/p2p_supplicant.c
View file

@ -3847,6 +3847,9 @@ static int wpas_p2p_setup_freqs(struct wpa_supplicant *wpa_s, int freq,
num = get_shared_radio_freqs(wpa_s, freqs,
wpa_s->num_multichan_concurrent);
wpa_printf(MSG_DEBUG,
"P2P: Setup freqs: freq=%d num_MCC=%d shared_freqs=%u",
freq, wpa_s->num_multichan_concurrent, num);
if (freq > 0) {
if (!p2p_supported_freq(wpa_s->global->p2p, freq)) {