diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2012-03-29 21:28:34 +0300 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2012-03-29 21:28:34 +0300 |
| commit | 21d996f775a2131bb0c73d6e18ca9b382f017057 (patch) | |
| tree | d32352d0ef626b3cae1b56faa6063daf8160db79 /src/p2p/p2p_go_neg.c | |
| parent | 564865e1d48ffa057cef1ecaf2eec59ae98e0be1 (diff) | |
| download | external_wpa_supplicant_8_ti-21d996f775a2131bb0c73d6e18ca9b382f017057.zip external_wpa_supplicant_8_ti-21d996f775a2131bb0c73d6e18ca9b382f017057.tar.gz external_wpa_supplicant_8_ti-21d996f775a2131bb0c73d6e18ca9b382f017057.tar.bz2 | |
P2P: Add support for preferred channel list
p2p_pref_chan configuration parameter can now be used to set the
list of preferred channel for P2P GO Negotiation. This will be used
in the priority order if the peer does not support the channel we
are trying to use as the GO (configured operating channel or the
best 2.4 GHz/5 GHz channel) for the case where a forced channel is
not used.
p2p_pref_chan=<op class:channel>,...
For example:
p2p_pref_chan=81:1,81:2,81:3,81:4,81:5,81:6
This would configure 2.4 GHz channels 1-6 as the preferred ones with
channel 1 the most preferred option.
These configuration parameters can be set in wpa_supplicant.conf and
dynamically updated with "wpa_cli set <param> <value>".
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'src/p2p/p2p_go_neg.c')
| -rw-r--r-- | src/p2p/p2p_go_neg.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c index 5216212..230948d 100644 --- a/src/p2p/p2p_go_neg.c +++ b/src/p2p/p2p_go_neg.c @@ -296,6 +296,7 @@ static void p2p_reselect_channel(struct p2p_data *p2p, struct p2p_reg_class *cl; int freq; u8 op_reg_class, op_channel; + unsigned int i; wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Selected operating " "channel (reg_class %u channel %u) not acceptable to the " @@ -328,6 +329,21 @@ static void p2p_reselect_channel(struct p2p_data *p2p, return; } + /* Select channel with highest preference if the peer supports it */ + for (i = 0; p2p->cfg->pref_chan && i < p2p->cfg->num_pref_chan; i++) { + if (p2p_channels_includes(intersection, + p2p->cfg->pref_chan[i].op_class, + p2p->cfg->pref_chan[i].chan)) { + p2p->op_reg_class = p2p->cfg->pref_chan[i].op_class; + p2p->op_channel = p2p->cfg->pref_chan[i].chan; + wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Pick " + "highest preferred chnnel (op_class %u " + "channel %u) from intersection", + p2p->op_reg_class, p2p->op_channel); + return; + } + } + /* * Fall back to whatever is included in the channel intersection since * no better options seems to be available. |