diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-08-22 16:40:29 +0300 |
|---|---|---|
| committer | Arik Nemtsov <arik@wizery.com> | 2012-07-30 17:48:05 +0300 |
| commit | 60919efc22857ac9aeeb50d83057c7819ae05145 (patch) | |
| tree | 2953cc6f7d8cf874e821b51db6cd368b6087915a /src/p2p | |
| parent | ab05c019cbdf5b0dc276aac98dbbb11cc21159d6 (diff) | |
| download | external_wpa_supplicant_8_ti-60919efc22857ac9aeeb50d83057c7819ae05145.zip external_wpa_supplicant_8_ti-60919efc22857ac9aeeb50d83057c7819ae05145.tar.gz external_wpa_supplicant_8_ti-60919efc22857ac9aeeb50d83057c7819ae05145.tar.bz2 | |
P2P: use GO channel for Operating Channel IE
[ To be upstreamed - Arik ]
Change-Id: I5285126515b47cd3b4cdce717310835f23a78f0a
Signed-off-by: Eliad Peller <eliad@wizery.com>
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p.c | 2 | ||||
| -rw-r--r-- | src/p2p/p2p.h | 2 | ||||
| -rw-r--r-- | src/p2p/p2p_invitation.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index f1d4345..5f53731 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -1063,7 +1063,7 @@ void p2p_stop_find(struct p2p_data *p2p) } -static int p2p_prepare_channel(struct p2p_data *p2p, unsigned int force_freq) +int p2p_prepare_channel(struct p2p_data *p2p, unsigned int force_freq) { if (force_freq) { u8 op_reg_class, op_channel; diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h index 7e47270..3fa5c61 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -1696,4 +1696,6 @@ int p2p_other_scan_completed(struct p2p_data *p2p); const char * p2p_wps_method_text(enum p2p_wps_method method); +int p2p_prepare_channel(struct p2p_data *p2p, unsigned int force_freq); + #endif /* P2P_H */ diff --git a/src/p2p/p2p_invitation.c b/src/p2p/p2p_invitation.c index 5925549..46a814f 100644 --- a/src/p2p/p2p_invitation.c +++ b/src/p2p/p2p_invitation.c @@ -466,8 +466,6 @@ int p2p_invite(struct p2p_data *p2p, const u8 *peer, enum p2p_invite_role role, p2p->channels.reg_class[0].reg_class = p2p->op_reg_class; p2p->channels.reg_class[0].channel[0] = p2p->op_channel; } else { - p2p->op_reg_class = p2p->cfg->op_reg_class; - p2p->op_channel = p2p->cfg->op_channel; os_memcpy(&p2p->channels, &p2p->cfg->channels, sizeof(struct p2p_channels)); } |