P2P: Remove unused P2P_SCAN_SPECIFIC

This is not used anymore after the commit
e6ecfc4fd3856309b2e1b9e0d23a8635752666e2.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index c18eaadb290fa8392291e8b9bb709b418d990d58..f011651fe803a62d6f3810b04c1687328878be61 100644 (file)
--- 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 98ba5cd6fee7b73af9639dcaa37e97226e27a966..7e472705d84f28bd9bb53387261c215f09733e4a 100644 (file)
--- 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 9e3961c3c04d81be6bf950cc061846989997914d..218ed2ff2b002b18a6d87f083d4ca69b0327759e 100644 (file)
--- 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;