From 6e24d5f69059dd10fd7b5752a9050b79d936a1d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sat, 30 Sep 2017 17:48:00 +0100 Subject: Unsplit "m2m" plugin (wimax mac-to-mac encapsulation) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/Makefile.am | 3 --- 1 file changed, 3 deletions(-) (limited to 'epan/Makefile.am') diff --git a/epan/Makefile.am b/epan/Makefile.am index 8c2eb3f9ac..bc5164a84a 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -484,9 +484,6 @@ plugin_src = \ ../plugins/irda/packet-irda.c \ ../plugins/irda/packet-sir.c \ ../plugins/irda/plugin.c \ - ../plugins/m2m/packet-m2m.c \ - ../plugins/m2m/plugin.c \ - ../plugins/m2m/wimax_tlv.c \ ../plugins/Makefile.am.inc \ ../plugins/mate/mate_grammar.c \ ../plugins/mate/mate_parser.c \ -- cgit v1.2.3