diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2018-01-01 23:38:13 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-02 07:41:24 +0000 |
| commit | 7a2fae2b796550eecaa03cf5e6631fa6a73ff7b5 (patch) | |
| tree | e21346ba748b60e7af7258ee0c123093b0772fae | |
| parent | d383e34408a2183a1e97273ea2789511e0a7d1ae (diff) | |
nxp802154: Remove unused code
The IEEE 802.15.4 dissector is built-in and will never be not present,
and if disabled then call_dissector() will call data handle.
Change-Id: Ie8d2a1bed1ba540df1a5bc239b57e475b346c8f1
Reviewed-on: https://code.wireshark.org/review/25103
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-nxp_802154_sniffer.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nxp_802154_sniffer.c b/epan/dissectors/packet-nxp_802154_sniffer.c index 31605392de..b21172e7d9 100644 --- a/epan/dissectors/packet-nxp_802154_sniffer.c +++ b/epan/dissectors/packet-nxp_802154_sniffer.c @@ -90,12 +90,7 @@ dissect_nxp_802154_sniffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } ieee802154_tvb = tvb_new_subset_length(tvb, offset, tvb_captured_length(tvb) - offset); - if(ieee802154_handle != NULL){ - call_dissector(ieee802154_handle, ieee802154_tvb, pinfo, tree); - }else{ - call_data_dissector(ieee802154_tvb, pinfo, tree); - col_add_fstr(pinfo->cinfo, COL_INFO, "No 802.15.4 dissector!"); - } + call_dissector(ieee802154_handle, ieee802154_tvb, pinfo, tree); return tvb_captured_length(tvb); } |