tests: Optimize tshark operations for new versions

The wlan_mgt to wlan renaming is already included in most recent tshark
versions, so replace the backwards compatibility option to prefer the
new version so that current versions do not need to take the performance
hit.

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

diff --git a/tests/hwsim/tshark.py b/tests/hwsim/tshark.py
index 019df781a760c657b8854acfcee94dc83e30575f..d6a57f0a35090f940cda2ef80c6a7fa8044393ab 100644 (file)
--- a/tests/hwsim/tshark.py
+++ b/tests/hwsim/tshark.py
@@ -88,7 +88,9 @@ def _run_tshark(filename, filter, display=None, wait=True):
 def run_tshark(filename, filter, display=None, wait=True):
     if display is None: display = []
     try:
-        return _run_tshark(filename, filter, display, wait)
+        return _run_tshark(filename, filter.replace('wlan_mgt', 'wlan'),
+                           [x.replace('wlan_mgt', 'wlan') for x in display],
+                           wait)
     except UnknownFieldsException as e:
         all_wlan_mgt = True
         for f in e.fields:
@@ -97,9 +99,7 @@ def run_tshark(filename, filter, display=None, wait=True):
                 break
         if not all_wlan_mgt:
             raise
-        return _run_tshark(filename, filter.replace('wlan_mgt', 'wlan'),
-                           [x.replace('wlan_mgt', 'wlan') for x in display],
-                           wait)
+        return _run_tshark(filename, filter, display, wait)
 
 def run_tshark_json(filename, filter):
     arg = ["tshark", "-r", filename,