tests: Remove ignore_old_scan_res workaround

Now that wpa_supplicant requests the driver (cfg80211) to clear its scan
cache automatically after each BSS_FLUSH/FLUSH command, the previously
used ignore_old_scan_res workaround should not be needed for the hwsim
test cases anymore.

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

diff --git a/tests/hwsim/test_ap_ciphers.py b/tests/hwsim/test_ap_ciphers.py
index a4982972687e287b955e865e65d4790a6b8c175e..dcabe313ec94f1cfc4bf72cc0633f178f86b2ca5 100644 (file)
--- a/tests/hwsim/test_ap_ciphers.py
+++ b/tests/hwsim/test_ap_ciphers.py
@@ -58,7 +58,6 @@ def test_ap_cipher_mixed_wpa_wpa2(dev, apdev):
                "rsn_pairwise": "CCMP",
                "wpa_pairwise": "TKIP" }
     hostapd.add_ap(apdev[0]['ifname'], params)
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].connect(ssid, psk=passphrase, proto="WPA2",
                    pairwise="CCMP", group="TKIP", scan_freq="2412")
     status = dev[0].get_status()

diff --git a/tests/hwsim/test_ap_dynamic.py b/tests/hwsim/test_ap_dynamic.py
index 659c1ccc0825bb96ae5c0b423a47bcb86920a493..3ee6c9727365c2b0834b6d34ab24b22c62c33675 100644 (file)
--- a/tests/hwsim/test_ap_dynamic.py
+++ b/tests/hwsim/test_ap_dynamic.py
@@ -66,8 +66,6 @@ def multi_check(dev, check):
 
 def test_ap_bss_add_remove(dev, apdev):
     """Dynamic BSS add/remove operations with hostapd"""
-    for d in dev:
-        d.request("SET ignore_old_scan_res 1")
     ifname1 = apdev[0]['ifname']
     ifname2 = apdev[0]['ifname'] + '-2'
     ifname3 = apdev[0]['ifname'] + '-3'
@@ -129,8 +127,6 @@ def test_ap_bss_add_remove(dev, apdev):
 
 def test_ap_bss_add_remove_during_ht_scan(dev, apdev):
     """Dynamic BSS add during HT40 co-ex scan"""
-    for d in dev:
-        d.request("SET ignore_old_scan_res 1")
     ifname1 = apdev[0]['ifname']
     ifname2 = apdev[0]['ifname'] + '-2'
     hostapd.add_bss('phy3', ifname1, 'bss-ht40-1.conf')
@@ -152,8 +148,6 @@ def test_ap_bss_add_remove_during_ht_scan(dev, apdev):
 
 def test_ap_multi_bss_config(dev, apdev):
     """hostapd start with a multi-BSS configuration file"""
-    for d in dev:
-        d.request("SET ignore_old_scan_res 1")
     ifname1 = apdev[0]['ifname']
     ifname2 = apdev[0]['ifname'] + '-2'
     ifname3 = apdev[0]['ifname'] + '-3'

diff --git a/tests/hwsim/test_ap_hs20.py b/tests/hwsim/test_ap_hs20.py
index 2470881c50198fbda830624bc0f77cc6d4b3c719..008b79393d1f91868cdb7e4dd127863215e5156c 100644 (file)
--- a/tests/hwsim/test_ap_hs20.py
+++ b/tests/hwsim/test_ap_hs20.py
@@ -147,7 +147,6 @@ def test_ap_anqp_sharing(dev, apdev):
     params['nai_realm'] = [ "0,example.com,13[5:6],21[2:4][5:7]" ]
     hostapd.add_ap(apdev[1]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com", 'username': "test",
                                   'password': "secret",
@@ -196,7 +195,6 @@ def test_ap_interworking_scan_filtering(dev, apdev):
     del params['venue_type']
     hostapd.add_ap(apdev[1]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
 
     wt = Wlantest()
@@ -256,7 +254,6 @@ def test_ap_hs20_select(dev, apdev):
     params['hessid'] = bssid
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com", 'username': "test",
                                   'password': "secret",
@@ -280,7 +277,6 @@ def hs20_simulated_sim(dev, ap, method):
     params['domain_name'] = "wlan.mnc444.mcc555.3gppnetwork.org"
     hostapd.add_ap(ap['ifname'], params)
 
-    dev.request("SET ignore_old_scan_res 1")
     dev.hs20_enable()
     dev.add_cred_values({ 'imsi': "555444-333222111", 'eap': method,
                           'milenage': "5122250214c33e723a5dd523fc145fc0:981d464c7c52eb6e5036234984ad0bcf:000000000123"})
@@ -317,7 +313,6 @@ def test_ap_hs20_ext_sim(dev, apdev):
     params['domain_name'] = "wlan.mnc001.mcc232.3gppnetwork.org"
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     dev[0].request("SET external_sim 1")
     dev[0].add_cred_values({ 'imsi': "23201-0000000000", 'eap': "SIM" })
@@ -336,7 +331,6 @@ def test_ap_hs20_ext_sim_roaming(dev, apdev):
     params['domain_name'] = "wlan.mnc091.mcc244.3gppnetwork.org"
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     dev[0].request("SET external_sim 1")
     dev[0].add_cred_values({ 'imsi': "23201-0000000000", 'eap': "SIM" })
@@ -351,7 +345,6 @@ def test_ap_hs20_username(dev, apdev):
     params['hessid'] = bssid
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com",
                                   'username': "hs20-test",
@@ -367,7 +360,6 @@ def eap_test(dev, ap, eap_params, method, user):
     params['nai_realm'] = [ "0,example.com," + eap_params ]
     hostapd.add_ap(ap['ifname'], params)
 
-    dev.request("SET ignore_old_scan_res 1")
     dev.hs20_enable()
     dev.add_cred_values({ 'realm': "example.com",
                           'username': user,
@@ -410,7 +402,6 @@ def test_ap_hs20_eap_tls(dev, apdev):
     params['nai_realm'] = [ "0,example.com,13[5:6]" ]
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     dev[0].add_cred_values({ 'realm': "example.com",
                              'username': "certificate-user",
@@ -428,7 +419,6 @@ def test_ap_hs20_nai_realms(dev, apdev):
     params['nai_realm'] = [ "0,no.match.here;example.com;no.match.here.either,21[2:1][5:7]" ]
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com",
                                   'username': "pap user",
@@ -445,7 +435,6 @@ def test_ap_hs20_roaming_consortium(dev, apdev):
     params['hessid'] = bssid
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com",
                                   'username': "user",
@@ -468,7 +457,6 @@ def test_ap_hs20_username_roaming(dev, apdev):
     params['hessid'] = bssid
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "roaming.example.com",
                                   'username': "hs20-test",
@@ -485,7 +473,6 @@ def test_ap_hs20_username_unknown(dev, apdev):
     params['hessid'] = bssid
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com",
                                   'username': "hs20-test",
@@ -502,7 +489,6 @@ def test_ap_hs20_username_unknown2(dev, apdev):
     del params['domain_name']
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com",
                                   'username': "hs20-test",
@@ -519,7 +505,6 @@ def test_ap_hs20_gas_while_associated(dev, apdev):
     params['hessid'] = bssid
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com",
                                   'username': "hs20-test",
@@ -544,7 +529,6 @@ def test_ap_hs20_gas_frag_while_associated(dev, apdev):
     hapd = hostapd.Hostapd(apdev[0]['ifname'])
     hapd.set("gas_frag_limit", "50")
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     id = dev[0].add_cred_values({ 'realm': "example.com",
                                   'username': "hs20-test",
@@ -567,7 +551,6 @@ def test_ap_hs20_multiple_connects(dev, apdev):
     params['hessid'] = bssid
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     values = { 'realm': "example.com",
                'username': "hs20-test",
@@ -605,7 +588,6 @@ def test_ap_hs20_disallow_aps(dev, apdev):
     params['hessid'] = bssid
     hostapd.add_ap(apdev[0]['ifname'], params)
 
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].hs20_enable()
     values = { 'realm': "example.com",
                'username': "hs20-test",
@@ -642,7 +624,6 @@ def policy_test(dev, ap, values, only_one=True):
     dev.dump_monitor()
     logger.info("Verify network selection to AP " + ap['ifname'])
     bssid = ap['bssid']
-    dev.request("SET ignore_old_scan_res 1")
     dev.hs20_enable()
     id = dev.add_cred_values(values)
     dev.request("INTERWORKING_SELECT auto")

diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py
index e45ff40252c6a0a86f589605ba4517f0d802f642..5c2110053a56d44b135fb892cda3d8fd309dcb06 100644 (file)
--- a/tests/hwsim/test_ap_wps.py
+++ b/tests/hwsim/test_ap_wps.py
@@ -24,7 +24,6 @@ def test_ap_wps_init(dev, apdev):
     hapd.request("WPS_PBC")
     if "PBC Status: Active" not in hapd.request("WPS_GET_STATUS"):
         raise Exception("PBC status not shown correctly")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[0].request("WPS_PBC")
     ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30)
@@ -66,7 +65,6 @@ def test_ap_wps_init_2ap_pbc(dev, apdev):
     hapd = hostapd.Hostapd(apdev[0]['ifname'])
     logger.info("WPS provisioning step")
     hapd.request("WPS_PBC")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].scan(freq="2412")
     bss = dev[0].get_bss(apdev[0]['bssid'])
     if "[WPS-PBC]" not in bss['flags']:
@@ -80,7 +78,6 @@ def test_ap_wps_init_2ap_pbc(dev, apdev):
     if ev is None:
         raise Exception("Association with the AP timed out")
 
-    dev[1].request("SET ignore_old_scan_res 1")
     dev[1].scan(freq="2412")
     bss = dev[1].get_bss(apdev[0]['bssid'])
     if "[WPS-PBC]" in bss['flags']:
@@ -99,7 +96,6 @@ def test_ap_wps_init_2ap_pin(dev, apdev):
     logger.info("WPS provisioning step")
     pin = dev[0].wps_read_pin()
     hapd.request("WPS_PIN any " + pin)
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].scan(freq="2412")
     bss = dev[0].get_bss(apdev[0]['bssid'])
     if "[WPS-AUTH]" not in bss['flags']:
@@ -113,7 +109,6 @@ def test_ap_wps_init_2ap_pin(dev, apdev):
     if ev is None:
         raise Exception("Association with the AP timed out")
 
-    dev[1].request("SET ignore_old_scan_res 1")
     dev[1].scan(freq="2412")
     bss = dev[1].get_bss(apdev[0]['bssid'])
     if "[WPS-AUTH]" in bss['flags']:
@@ -174,7 +169,6 @@ def test_ap_wps_twice(dev, apdev):
     hapd = hostapd.Hostapd(apdev[0]['ifname'])
     logger.info("WPS provisioning step")
     hapd.request("WPS_PBC")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[0].request("WPS_PBC")
     ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30)
@@ -210,7 +204,6 @@ def test_ap_wps_incorrect_pin(dev, apdev):
 
     logger.info("WPS provisioning attempt 1")
     hapd.request("WPS_PIN any 12345670")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[0].request("WPS_PIN any 55554444")
     ev = dev[0].wait_event(["WPS-FAIL"], timeout=30)
@@ -257,7 +250,6 @@ def test_ap_wps_conf_pin(dev, apdev):
     logger.info("WPS provisioning step")
     pin = dev[0].wps_read_pin()
     hapd.request("WPS_PIN any " + pin)
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[0].request("WPS_PIN any " + pin)
     ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30)
@@ -273,7 +265,6 @@ def test_ap_wps_conf_pin(dev, apdev):
     if status['key_mgmt'] != 'WPA2-PSK':
         raise Exception("Unexpected key_mgmt")
 
-    dev[1].request("SET ignore_old_scan_res 1")
     dev[1].scan(freq="2412")
     bss = dev[1].get_bss(apdev[0]['bssid'])
     if "[WPS-AUTH]" in bss['flags']:
@@ -299,9 +290,7 @@ def test_ap_wps_conf_pin_2sta(dev, apdev):
     pin2 = "55554444"
     hapd.request("WPS_PIN " + dev[0].get_status_field("uuid") + " " + pin)
     hapd.request("WPS_PIN " + dev[1].get_status_field("uuid") + " " + pin)
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
-    dev[1].request("SET ignore_old_scan_res 1")
     dev[1].dump_monitor()
     dev[0].request("WPS_PIN any " + pin)
     dev[1].request("WPS_PIN any " + pin)
@@ -322,7 +311,6 @@ def test_ap_wps_reg_connect(dev, apdev):
                      "wpa_key_mgmt": "WPA-PSK", "rsn_pairwise": "CCMP",
                      "ap_pin": appin})
     logger.info("WPS provisioning step")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[0].wps_reg(apdev[0]['bssid'], appin)
     status = dev[0].get_status()
@@ -366,12 +354,10 @@ def test_ap_wps_random_ap_pin(dev, apdev):
     if appin not in hapd.request("WPS_AP_PIN get"):
         raise Exception("Could not fetch current AP PIN")
     logger.info("WPS provisioning step")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].wps_reg(apdev[0]['bssid'], appin)
 
     hapd.request("WPS_AP_PIN disable")
     logger.info("WPS provisioning step with AP PIN disabled")
-    dev[1].request("SET ignore_old_scan_res 1")
     check_wps_reg_failure(dev[1], apdev[0], appin)
 
     logger.info("WPS provisioning step with AP PIN reset")
@@ -408,7 +394,6 @@ def test_ap_wps_reg_config(dev, apdev):
                    { "ssid": ssid, "eap_server": "1", "wps_state": "2",
                      "ap_pin": appin})
     logger.info("WPS configuration step")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     new_ssid = "wps-new-ssid"
     new_passphrase = "1234567890"
@@ -432,7 +417,6 @@ def test_ap_wps_reg_config_tkip(dev, apdev):
                    { "ssid": ssid, "eap_server": "1", "wps_state": "1",
                      "ap_pin": appin})
     logger.info("WPS configuration step")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].request("SET wps_version_number 0x10")
     dev[0].dump_monitor()
     new_ssid = "wps-new-ssid-with-tkip"
@@ -464,7 +448,6 @@ def test_ap_wps_setup_locked(dev, apdev):
                      "wpa_passphrase": "12345678", "wpa": "2",
                      "wpa_key_mgmt": "WPA-PSK", "rsn_pairwise": "CCMP",
                      "ap_pin": appin})
-    dev[0].request("SET ignore_old_scan_res 1")
     new_ssid = "wps-new-ssid-test"
     new_passphrase = "1234567890"
 
@@ -545,8 +528,6 @@ def test_ap_wps_pbc_overlap_2sta(dev, apdev):
     hapd = hostapd.Hostapd(apdev[0]['ifname'])
     logger.info("WPS provisioning step")
     hapd.request("WPS_PBC")
-    dev[0].request("SET ignore_old_scan_res 1")
-    dev[1].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[1].dump_monitor()
     dev[0].request("WPS_PBC")
@@ -574,7 +555,6 @@ def test_ap_wps_cancel(dev, apdev):
 
     logger.info("Verify PBC enable/cancel")
     hapd.request("WPS_PBC")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].scan(freq="2412")
     bss = dev[0].get_bss(apdev[0]['bssid'])
     if "[WPS-PBC]" not in bss['flags']:
@@ -615,7 +595,6 @@ def test_ap_wps_er_add_enrollee(dev, apdev):
     logger.info("WPS configuration step")
     new_passphrase = "1234567890"
     dev[0].dump_monitor()
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].wps_reg(apdev[0]['bssid'], ap_pin, ssid, "WPA2PSK", "CCMP",
                    new_passphrase)
     status = dev[0].get_status()
@@ -653,7 +632,6 @@ def test_ap_wps_er_add_enrollee(dev, apdev):
     pin = dev[1].wps_read_pin()
     dev[0].dump_monitor()
     dev[0].request("WPS_ER_PIN any " + pin + " " + dev[1].p2p_interface_addr())
-    dev[1].request("SET ignore_old_scan_res 1")
     dev[1].dump_monitor()
     dev[1].request("WPS_PIN any " + pin)
     ev = dev[1].wait_event(["WPS-SUCCESS"], timeout=30)
@@ -705,7 +683,6 @@ def test_ap_wps_er_add_enrollee_pbc(dev, apdev):
                      "ap_pin": ap_pin, "uuid": ap_uuid, "upnp_iface": "lo"})
     logger.info("Learn AP configuration")
     dev[0].dump_monitor()
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].wps_reg(apdev[0]['bssid'], ap_pin)
     status = dev[0].get_status()
     if status['wpa_state'] != 'COMPLETED' or status['bssid'] != apdev[0]['bssid']:
@@ -725,7 +702,6 @@ def test_ap_wps_er_add_enrollee_pbc(dev, apdev):
     logger.info("Add Enrollee using ER and PBC")
     dev[0].dump_monitor()
     enrollee = dev[1].p2p_interface_addr()
-    dev[1].request("SET ignore_old_scan_res 1")
     dev[1].dump_monitor()
     dev[1].request("WPS_PBC")
 
@@ -799,7 +775,6 @@ def test_ap_wps_fragmentation(dev, apdev):
     hapd = hostapd.Hostapd(apdev[0]['ifname'])
     logger.info("WPS provisioning step")
     hapd.request("WPS_PBC")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[0].request("SET wps_fragment_size 50")
     dev[0].request("WPS_PBC")
@@ -824,7 +799,6 @@ def test_ap_wps_new_version_sta(dev, apdev):
     hapd = hostapd.Hostapd(apdev[0]['ifname'])
     logger.info("WPS provisioning step")
     hapd.request("WPS_PBC")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[0].request("SET wps_version_number 0x43")
     dev[0].request("WPS_PBC")
@@ -844,7 +818,6 @@ def test_ap_wps_new_version_ap(dev, apdev):
     if "FAIL" in hapd.request("SET wps_version_number 0x43"):
         raise Exception("Failed to enable test functionality")
     hapd.request("WPS_PBC")
-    dev[0].request("SET ignore_old_scan_res 1")
     dev[0].dump_monitor()
     dev[0].request("WPS_PBC")
     ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30)

diff --git a/tests/hwsim/test_nfc_wps.py b/tests/hwsim/test_nfc_wps.py
index eab6d1a9d6505dfd3ae31f7bc93f10665bd93050..0fab421b20214966cc05549cbd6d2fe3f9e0e9bd 100644 (file)
--- a/tests/hwsim/test_nfc_wps.py
+++ b/tests/hwsim/test_nfc_wps.py
@@ -37,7 +37,6 @@ def ap_wps_params(ssid):
 
 def test_nfc_wps_password_token_sta(dev, apdev):
     """NFC tag with password token on the station/Enrollee"""
-    dev[0].request("SET ignore_old_scan_res 1")
     ssid = "test-wps-nfc-pw-token-conf"
     params = ap_wps_params(ssid)
     hostapd.add_ap(apdev[0]['ifname'], params)
@@ -79,7 +78,6 @@ def test_nfc_wps_config_token(dev, apdev):
 
 def test_nfc_wps_config_token_init(dev, apdev):
     """NFC tag with configuration token from AP with auto configuration"""
-    dev[0].request("SET ignore_old_scan_res 1")
     ssid = "test-wps-nfc-conf-token-init"
     hostapd.add_ap(apdev[0]['ifname'],
                    { "ssid": ssid, "eap_server": "1", "wps_state": "1" })
@@ -99,7 +97,6 @@ def test_nfc_wps_config_token_init(dev, apdev):
 
 def test_nfc_wps_password_token_sta_init(dev, apdev):
     """Initial AP configuration with first WPS NFC Enrollee"""
-    dev[0].request("SET ignore_old_scan_res 1")
     ssid = "test-wps-nfc-pw-token-init"
     hostapd.add_ap(apdev[0]['ifname'],
                    { "ssid": ssid, "eap_server": "1", "wps_state": "1" })
@@ -122,7 +119,6 @@ def test_nfc_wps_password_token_sta_init(dev, apdev):
 
 def test_nfc_wps_password_token_ap(dev, apdev):
     """WPS registrar configuring an AP using AP password token"""
-    dev[0].request("SET ignore_old_scan_res 1")
     ssid = "test-wps-nfc-pw-token-init"
     hostapd.add_ap(apdev[0]['ifname'],
                    { "ssid": ssid, "eap_server": "1", "wps_state": "1" })

diff --git a/tests/hwsim/test_p2p_autogo.py b/tests/hwsim/test_p2p_autogo.py
index d3fb22bb14fb23d61d0900b770ebd3b2e562bf94..ad4a3d91d76a460c6f1a1bafc0c674cc02e6e481 100644 (file)
--- a/tests/hwsim/test_p2p_autogo.py
+++ b/tests/hwsim/test_p2p_autogo.py
@@ -184,7 +184,6 @@ def test_autogo_legacy(dev):
     logger.info("Connect legacy WPS client")
     pin = dev[2].wps_read_pin()
     dev[0].p2p_go_authorize_client(pin)
-    dev[2].request("SET ignore_old_scan_res 1")
     dev[2].request("P2P_SET disabled 1")
     dev[2].dump_monitor()
     dev[2].request("WPS_PIN any " + pin)

diff --git a/tests/hwsim/test_p2p_grpform.py b/tests/hwsim/test_p2p_grpform.py
index 868dc8d67067749521d81ac225bd7d32e0cc8b0f..74378887ddef0147ce5abf81988d217b19701184 100644 (file)
--- a/tests/hwsim/test_p2p_grpform.py
+++ b/tests/hwsim/test_p2p_grpform.py
@@ -211,8 +211,6 @@ def test_grpform3_c(dev):
 
 def test_grpform_pbc(dev):
     """P2P group formation using PBC and re-init GO Negotiation"""
-    dev[0].request("SET ignore_old_scan_res 1")
-    dev[1].request("SET ignore_old_scan_res 1")
     [i_res, r_res] = go_neg_pbc(i_dev=dev[0], i_intent=15, r_dev=dev[1], r_intent=0)
     check_grpform_results(i_res, r_res)
     if i_res['role'] != 'GO' or r_res['role'] != 'client':

diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py
index fd07782de078dcdd5fdacf56f63de4913628ee94..fb3e2daf0f2a74484e856f35e479898757289973 100644 (file)
--- a/tests/hwsim/wpasupplicant.py
+++ b/tests/hwsim/wpasupplicant.py
@@ -86,7 +86,6 @@ class WpaSupplicant:
         res = self.request("FLUSH")
         if not "OK" in res:
             logger.info("FLUSH to " + self.ifname + " failed: " + res)
-        self.request("SET ignore_old_scan_res 0")
         self.request("SET external_sim 0")
         self.request("SET hessid 00:00:00:00:00:00")
         self.request("SET access_network_type 15")