aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2016-10-16 15:58:09 +0200
committerJörg Mayer <jmayer@loplof.de>2016-10-16 14:03:55 +0000
commit95c944884ab00db7529512129f0292f1a74aa1fd (patch)
tree8632706c650655c82278b90c04b2c1ced6455c3f /epan
parent9711d2220ce1584a37e9e7d7df3ebf3c8e57b23d (diff)
More wlan_mgt cleanup:
- Fix test script to use wlan instead of wlan_mgt - Remove a now useless test in the dissector Change-Id: I9a7644947c3002c759a7ae5728a8559682cfd4fd Reviewed-on: https://code.wireshark.org/review/18215 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ieee80211.c6
1 files changed, 0 insertions, 6 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);