tests: Mesh ht_mode options

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

tests/hwsim/test_wpas_mesh.py

@@ -88,12 +88,12 @@ def test_wpas_add_set_remove_support(dev):
     dev[0].set_network(id, "mode", "5")
     dev[0].remove_network(id)
 
-def add_open_mesh_network(dev, ht_mode=False, start=True):
+def add_open_mesh_network(dev, ht_mode=False, freq="2412", start=True):
     id = dev.add_network()
     dev.set_network(id, "mode", "5")
     dev.set_network_quoted(id, "ssid", "wpas-mesh-open")
     dev.set_network(id, "key_mgmt", "NONE")
-    dev.set_network(id, "frequency", "2412")
+    dev.set_network(id, "frequency", freq)
     if ht_mode:
         dev.set_network(id, "mesh_ht_mode", ht_mode)
     if start:
@@ -110,7 +110,7 @@ def test_wpas_mesh_group_added(dev):
 
 def test_wpas_mesh_group_remove(dev):
     """wpa_supplicant MESH group remove"""
-    add_open_mesh_network(dev[0])
+    add_open_mesh_network(dev[0], ht_mode="NOHT")
     # Check for MESH-GROUP-STARTED event
     check_mesh_group_added(dev[0])
     dev[0].mesh_group_remove()
@@ -120,8 +120,8 @@ def test_wpas_mesh_group_remove(dev):
 
 def test_wpas_mesh_peer_connected(dev):
     """wpa_supplicant MESH peer connected"""
-    add_open_mesh_network(dev[0])
-    add_open_mesh_network(dev[1])
+    add_open_mesh_network(dev[0], ht_mode="HT20")
+    add_open_mesh_network(dev[1], ht_mode="HT20")
 
     # Check for mesh joined
     check_mesh_group_added(dev[0])
@@ -172,8 +172,8 @@ def wrap_wpas_mesh_test(test, dev, apdev):
 
 
 def _test_wpas_mesh_open(dev, apdev, test_connectivity):
-    add_open_mesh_network(dev[0], ht_mode="HT40+")
-    add_open_mesh_network(dev[1], ht_mode="HT40+")
+    add_open_mesh_network(dev[0], ht_mode="HT40-", freq="2462")
+    add_open_mesh_network(dev[1], ht_mode="HT40-", freq="2462")
 
     # Check for mesh joined
     check_mesh_group_added(dev[0])