From 3df2f4fe99e18f7fb449477a63d13abb3ad4c891 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 30 Jun 2012 20:20:29 +0300 Subject: [PATCH] P2P: Remove unused P2P_SCAN_SPECIFIC This is not used anymore after the commit e6ecfc4fd3856309b2e1b9e0d23a8635752666e2. Signed-hostap: Jouni Malinen --- src/drivers/driver_test.c | 5 ----- src/p2p/p2p.h | 4 +--- wpa_supplicant/p2p_supplicant.c | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c index c18eaadb2..f011651fe 100644 --- a/src/drivers/driver_test.c +++ b/src/drivers/driver_test.c @@ -2962,11 +2962,6 @@ static int test_p2p_scan(void *ctx, enum p2p_scan_type type, int freq, break; case P2P_SCAN_FULL: break; - case P2P_SCAN_SPECIFIC: - social_channels[0] = freq; - social_channels[1] = 0; - params.freqs = social_channels; - break; case P2P_SCAN_SOCIAL_PLUS_ONE: social_channels[3] = freq; params.freqs = social_channels; diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h index 98ba5cd6f..7e472705d 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -131,7 +131,6 @@ struct p2p_data; enum p2p_scan_type { P2P_SCAN_SOCIAL, P2P_SCAN_FULL, - P2P_SCAN_SPECIFIC, P2P_SCAN_SOCIAL_PLUS_ONE }; @@ -376,8 +375,7 @@ struct p2p_config { * operation to be completed. Type type argument specifies which type * of scan is to be done. @P2P_SCAN_SOCIAL indicates that only the * social channels (1, 6, 11) should be scanned. @P2P_SCAN_FULL - * indicates that all channels are to be scanned. @P2P_SCAN_SPECIFIC - * request a scan of a single channel specified by freq. + * indicates that all channels are to be scanned. * @P2P_SCAN_SOCIAL_PLUS_ONE request scan of all the social channels * plus one extra channel specified by freq. * diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 9e3961c3c..218ed2ff2 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -151,11 +151,6 @@ static int wpas_p2p_scan(void *ctx, enum p2p_scan_type type, int freq, break; case P2P_SCAN_FULL: break; - case P2P_SCAN_SPECIFIC: - social_channels[0] = freq; - social_channels[1] = 0; - params.freqs = social_channels; - break; case P2P_SCAN_SOCIAL_PLUS_ONE: social_channels[3] = freq; params.freqs = social_channels;