From 52ed13b78d7606823a2db77e0ecb613348332dbc Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Sat, 18 Apr 2020 11:31:49 +0300
Subject: [PATCH] tests: Move csa_supported() into utils.py

Signed-off-by: Jouni Malinen <j@w1.fi>
---
 tests/hwsim/test_ap_csa.py | 9 +--------
 tests/hwsim/test_ap_ht.py  | 1 -
 tests/hwsim/test_ap_vht.py | 1 -
 tests/hwsim/test_he.py     | 1 -
 tests/hwsim/test_scan.py   | 2 +-
 tests/hwsim/utils.py       | 7 +++++++
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/tests/hwsim/test_ap_csa.py b/tests/hwsim/test_ap_csa.py
index 2bf9c9a8a..744d1e1f2 100644
--- a/tests/hwsim/test_ap_csa.py
+++ b/tests/hwsim/test_ap_csa.py
@@ -11,7 +11,7 @@ logger = logging.getLogger()
 
 import hwsim_utils
 import hostapd
-from utils import HwsimSkip
+from utils import *
 
 def connect(dev, apdev, scan_freq="2412", **kwargs):
     params = {"ssid": "ap-csa",
@@ -55,13 +55,6 @@ def wait_channel_switch(dev, freq):
     if "freq=%d" % freq not in ev:
         raise Exception("Unexpected frequency: " + ev)
 
-# This function checks whether the provided dev, which may be either
-# WpaSupplicant or Hostapd supports CSA.
-def csa_supported(dev):
-    res = dev.get_driver_status()
-    if (int(res['capa.flags'], 0) & 0x80000000) == 0:
-        raise HwsimSkip("CSA not supported")
-
 @remote_compatible
 def test_ap_csa_1_switch(dev, apdev):
     """AP Channel Switch, one switch"""
diff --git a/tests/hwsim/test_ap_ht.py b/tests/hwsim/test_ap_ht.py
index 51187177b..99adb12a3 100644
--- a/tests/hwsim/test_ap_ht.py
+++ b/tests/hwsim/test_ap_ht.py
@@ -14,7 +14,6 @@ import hostapd
 from wpasupplicant import WpaSupplicant
 from utils import *
 import hwsim_utils
-from test_ap_csa import csa_supported
 
 def test_ap_ht40_scan(dev, apdev):
     """HT40 co-ex scan"""
diff --git a/tests/hwsim/test_ap_vht.py b/tests/hwsim/test_ap_vht.py
index f0e2f3d61..dce0dfff9 100644
--- a/tests/hwsim/test_ap_vht.py
+++ b/tests/hwsim/test_ap_vht.py
@@ -15,7 +15,6 @@ import hostapd
 from wpasupplicant import WpaSupplicant
 from utils import *
 from test_dfs import wait_dfs_event
-from test_ap_csa import csa_supported
 
 def test_ap_vht80(dev, apdev):
     """VHT with 80 MHz channel width"""
diff --git a/tests/hwsim/test_he.py b/tests/hwsim/test_he.py
index 22c9402f7..ce3199290 100644
--- a/tests/hwsim/test_he.py
+++ b/tests/hwsim/test_he.py
@@ -14,7 +14,6 @@ import hostapd
 from wpasupplicant import WpaSupplicant
 from utils import *
 from test_dfs import wait_dfs_event
-from test_ap_csa import csa_supported
 
 def test_he_open(dev, apdev):
     """HE AP with open mode configuration"""
diff --git a/tests/hwsim/test_scan.py b/tests/hwsim/test_scan.py
index ef6ebbaf6..9bf7a0fd4 100644
--- a/tests/hwsim/test_scan.py
+++ b/tests/hwsim/test_scan.py
@@ -17,7 +17,7 @@ import hostapd
 from wpasupplicant import WpaSupplicant
 from utils import *
 from tshark import run_tshark
-from test_ap_csa import switch_channel, wait_channel_switch, csa_supported
+from test_ap_csa import switch_channel, wait_channel_switch
 
 def check_scan(dev, params, other_started=False, test_busy=False):
     if not other_started:
diff --git a/tests/hwsim/utils.py b/tests/hwsim/utils.py
index 5afa76b24..c259a766c 100644
--- a/tests/hwsim/utils.py
+++ b/tests/hwsim/utils.py
@@ -120,6 +120,13 @@ def vht_supported():
         return True
     return False
 
+# This function checks whether the provided dev, which may be either
+# WpaSupplicant or Hostapd supports CSA.
+def csa_supported(dev):
+    res = dev.get_driver_status()
+    if (int(res['capa.flags'], 0) & 0x80000000) == 0:
+        raise HwsimSkip("CSA not supported")
+
 def get_phy(ap, ifname=None):
     phy = "phy3"
     try: