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

P2P: Restore P2P_SCAN_SPECIFIC

Browse source 
This reverts commit 3df2f4fe99 ('P2P:
Remove unused P2P_SCAN_SPECIFIC') with a modification to fit the current
code base.

Signed-off-by: Daichi Ueura <daichi.ueura@sonymobile.com>
This commit is contained in:
Daichi Ueura 2014-11-05 20:35:08 +09:00 committed by Jouni Malinen
parent d988ff76bf
commit eb78a8d5e3
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p2p/p2p.h
View file

@ -245,6 +245,7 @@ struct p2p_data;
enum p2p_scan_type { enum p2p_scan_type {
P2P_SCAN_SOCIAL, P2P_SCAN_SOCIAL,
P2P_SCAN_FULL, P2P_SCAN_FULL,
P2P_SCAN_SPECIFIC,
P2P_SCAN_SOCIAL_PLUS_ONE P2P_SCAN_SOCIAL_PLUS_ONE
}; };
@ -545,7 +546,8 @@ struct p2p_config {
* operation to be completed. Type type argument specifies which type * operation to be completed. Type type argument specifies which type
* of scan is to be done. @P2P_SCAN_SOCIAL indicates that only the * of scan is to be done. @P2P_SCAN_SOCIAL indicates that only the
* social channels (1, 6, 11) should be scanned. @P2P_SCAN_FULL * social channels (1, 6, 11) should be scanned. @P2P_SCAN_FULL
* indicates that all channels are to be scanned. * indicates that all channels are to be scanned. @P2P_SCAN_SPECIFIC
* request a scan of a single channel specified by freq.
* @P2P_SCAN_SOCIAL_PLUS_ONE request scan of all the social channels * @P2P_SCAN_SOCIAL_PLUS_ONE request scan of all the social channels
* plus one extra channel specified by freq. * plus one extra channel specified by freq.
* *

7
wpa_supplicant/p2p_supplicant.c
View file

@ -377,6 +377,13 @@ static int wpas_p2p_scan(void *ctx, enum p2p_scan_type type, int freq,
break; break;
case P2P_SCAN_FULL: case P2P_SCAN_FULL:
break; break;
case P2P_SCAN_SPECIFIC:
params->freqs = os_calloc(2, sizeof(int));
if (params->freqs == NULL)
goto fail;
params->freqs[0] = freq;
params->freqs[1] = 0;
break;
case P2P_SCAN_SOCIAL_PLUS_ONE: case P2P_SCAN_SOCIAL_PLUS_ONE:
params->freqs = os_calloc(ARRAY_SIZE(social_channels_freq) + 2, params->freqs = os_calloc(ARRAY_SIZE(social_channels_freq) + 2,
sizeof(int)); sizeof(int));