From b2d4aaa2c7f35a7b7a5accb60d1583894299ef56 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 18 Nov 2013 17:46:14 +0200 Subject: [PATCH] P2P: Select VHT channel at random instead of using the first entry Use the new p2p_channel_select() function to select a VHT channel at random when no other preferences are in effect. Signed-hostap: Jouni Malinen --- src/p2p/p2p_go_neg.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c index 252870701..325b83256 100644 --- a/src/p2p/p2p_go_neg.c +++ b/src/p2p/p2p_go_neg.c @@ -350,6 +350,7 @@ void p2p_reselect_channel(struct p2p_data *p2p, unsigned int i; const int op_classes_5ghz[] = { 115, 124, 0 }; const int op_classes_ht40[] = { 116, 117, 126, 127, 0 }; + const int op_classes_vht[] = { 128, 0 }; if (p2p->own_freq_preference > 0 && p2p_freq_to_channel(p2p->own_freq_preference, @@ -415,15 +416,11 @@ void p2p_reselect_channel(struct p2p_data *p2p, } /* Try a channel where we might be able to use VHT */ - for (i = 0; i < intersection->reg_classes; i++) { - struct p2p_reg_class *c = &intersection->reg_class[i]; - if (c->reg_class == 128) { - p2p_dbg(p2p, "Pick possible VHT channel (reg_class %u channel %u) from intersection", - c->reg_class, c->channel[0]); - p2p->op_reg_class = c->reg_class; - p2p->op_channel = c->channel[0]; - return; - } + if (p2p_channel_select(intersection, op_classes_vht, + &p2p->op_reg_class, &p2p->op_channel) == 0) { + p2p_dbg(p2p, "Pick possible VHT channel (op_class %u channel %u) from intersection", + p2p->op_reg_class, p2p->op_channel); + return; } /* Try a channel where we might be able to use HT40 */