diff options
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 6 | ||||
| -rwxr-xr-x | test/suite-decryption.sh | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 4a15eafb99..bc928cf219 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -16119,12 +16119,6 @@ dissect_ieee80211_mgt(guint16 fcf, tvbuff_t *tvb, packet_info *pinfo, proto_tree ieee80211_tvb_invalid = FALSE; - /* check protocol activation */ - if (!proto_is_protocol_enabled(find_protocol_by_id(proto_wlan))) { - call_data_dissector(tvb, pinfo, tree); - return; - } - ti = proto_tree_add_item(tree, proto_wlan, tvb, 0, -1, ENC_NA); mgt_tree = proto_item_add_subtree(ti, ett_80211_mgt); diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh index a8ff669751..00e4bf3ce3 100755 --- a/test/suite-decryption.sh +++ b/test/suite-decryption.sh @@ -113,7 +113,7 @@ decryption_step_80211_wpa_psk_mfp() { out=$($TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \ -o "wlan.enable_decryption: TRUE" \ -r "$CAPTURE_DIR/wpa-test-decode-mgmt.pcap.gz" \ - -Y "wlan_mgt.fixed.reason_code == 2 || wlan_mgt.fixed.category_code == 3" \ + -Y "wlan.fixed.reason_code == 2 || wlan.fixed.category_code == 3" \ 2>&1) RETURNVALUE=$? frames=$(echo "$out" | wc -l) |