From 62bdf888459a6d2ae50d2d2d00447307e0190a97 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 15 Aug 2014 10:21:01 +0200
Subject: [PATCH] dissectors: Remove unnecessary includes of dissector_eth.h

dissector_eth.h is only used in dissectors which need to manipulate the
eth_lay2 and eth_lay3 hash tables. Remove the include from all
dissectors that don't access them.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 proto_arp.c    | 1 -
 proto_icmpv4.c | 1 -
 proto_icmpv6.c | 1 -
 proto_igmp.c   | 1 -
 proto_ip_esp.c | 1 -
 proto_lldp.c   | 1 +
 proto_tcp.c    | 1 -
 proto_udp.c    | 1 -
 8 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/proto_arp.c b/proto_arp.c
index d677b3d6..fcbe02bf 100644
--- a/proto_arp.c
+++ b/proto_arp.c
@@ -8,7 +8,6 @@
 #include <netinet/in.h>    /* for ntohs() */
 
 #include "proto.h"
-#include "dissector_eth.h"
 #include "lookup.h"
 #include "pkt_buff.h"
 #include "built_in.h"
diff --git a/proto_icmpv4.c b/proto_icmpv4.c
index 69ec50ce..5ef074d6 100644
--- a/proto_icmpv4.c
+++ b/proto_icmpv4.c
@@ -10,7 +10,6 @@
 
 #include "proto.h"
 #include "csum.h"
-#include "dissector_eth.h"
 #include "pkt_buff.h"
 #include "built_in.h"
 
diff --git a/proto_icmpv6.c b/proto_icmpv6.c
index ba2af5e4..47ef6a63 100644
--- a/proto_icmpv6.c
+++ b/proto_icmpv6.c
@@ -18,7 +18,6 @@
 #include <asm/byteorder.h>
 
 #include "proto.h"
-#include "dissector_eth.h"
 #include "pkt_buff.h"
 #include "built_in.h"
 
diff --git a/proto_igmp.c b/proto_igmp.c
index 0e1cfb7b..e535fa7d 100644
--- a/proto_igmp.c
+++ b/proto_igmp.c
@@ -11,7 +11,6 @@
 
 #include "proto.h"
 #include "csum.h"
-#include "dissector_eth.h"
 #include "built_in.h"
 #include "pkt_buff.h"
 
diff --git a/proto_ip_esp.c b/proto_ip_esp.c
index 8dabdb34..c5881417 100644
--- a/proto_ip_esp.c
+++ b/proto_ip_esp.c
@@ -11,7 +11,6 @@
 #include <netinet/in.h>    /* for ntohs() */
 
 #include "proto.h"
-#include "dissector_eth.h"
 #include "built_in.h"
 #include "pkt_buff.h"
 
diff --git a/proto_lldp.c b/proto_lldp.c
index b3d2f865..93012819 100644
--- a/proto_lldp.c
+++ b/proto_lldp.c
@@ -12,6 +12,7 @@
 #include "oui.h"
 #include "pkt_buff.h"
 #include "proto.h"
+#include "protos.h"
 
 #define EXTRACT_16BIT(x)	ntohs(*((uint16_t *) (x)))
 #define EXTRACT_32BIT(x)	ntohl(*((uint32_t *) (x)))
diff --git a/proto_tcp.c b/proto_tcp.c
index 893b0b36..04ae8585 100644
--- a/proto_tcp.c
+++ b/proto_tcp.c
@@ -11,7 +11,6 @@
 #include <asm/byteorder.h>
 
 #include "proto.h"
-#include "dissector_eth.h"
 #include "lookup.h"
 #include "built_in.h"
 #include "pkt_buff.h"
diff --git a/proto_udp.c b/proto_udp.c
index 4b4ed807..af3b82b0 100644
--- a/proto_udp.c
+++ b/proto_udp.c
@@ -9,7 +9,6 @@
 #include <netinet/in.h>    /* for ntohs() */
 
 #include "proto.h"
-#include "dissector_eth.h"
 #include "lookup.h"
 #include "pkt_buff.h"
 
-- 
2.11.4.GIT