From 985718135f663f1d0762799cf2034b5689679a07 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 27 Dec 2019 00:02:05 +0200 Subject: [PATCH] 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 --- tests/hwsim/tshark.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/tshark.py b/tests/hwsim/tshark.py index 019df781a..d6a57f0a3 100644 --- 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,