From 4e3114d01dd2ddbf4044bcd5c91812d3bd3f7fbd Mon Sep 17 00:00:00 2001
From: Michael Mann <mmann78@netscape.net>
Date: Sat, 21 Oct 2017 10:22:43 -0400
Subject: [PATCH] Eliminate #include <epan/oui.h> from dissectors that don't
 need it.

Correct include patch for packet-lldp.c

Change-Id: I5e2a267943ccd39616ef323848104fdba23c8f38
Reviewed-on: https://code.wireshark.org/review/24009
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 epan/dissectors/packet-bootp.c      | 1 -
 epan/dissectors/packet-btatt.c      | 1 -
 epan/dissectors/packet-cdp.c        | 1 -
 epan/dissectors/packet-fr.c         | 1 -
 epan/dissectors/packet-iapp.c       | 1 -
 epan/dissectors/packet-ieee802154.c | 1 -
 epan/dissectors/packet-lldp.c       | 2 +-
 epan/dissectors/packet-nhrp.c       | 1 -
 epan/dissectors/packet-ppp.c        | 1 -
 epan/dissectors/packet-thread.c     | 1 -
 epan/dissectors/packet-wifi-p2p.c   | 1 -
 11 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 5899e09d60..f0d941ef3d 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -124,7 +124,6 @@
 #include <epan/addr_resolv.h>
 #include <epan/expert.h>
 #include <epan/uat.h>
-#include <epan/oui.h>
 #include <epan/strutil.h>
 #include <wsutil/str_util.h>
 #include <wsutil/strtoi.h>
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c
index 8a88d954b1..f5398f5aa5 100644
--- a/epan/dissectors/packet-btatt.c
+++ b/epan/dissectors/packet-btatt.c
@@ -31,7 +31,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/oui.h>
 #include <epan/decode_as.h>
 #include <epan/tap.h>
 #include <epan/proto_data.h>
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index a05641d27c..900e122030 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -27,7 +27,6 @@
 #include <epan/expert.h>
 #include <epan/to_str.h>
 #include <epan/in_cksum.h>
-#include <epan/oui.h>
 #include <epan/nlpid.h>
 
 
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index f1f7140bb8..d35d0827b7 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -50,7 +50,6 @@
 #include "packet-l2tp.h"
 #include <epan/xdlc.h>
 #include <epan/etypes.h>
-#include <epan/oui.h>
 #include <epan/nlpid.h>
 
 void proto_register_fr(void);
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index 7a664c2d44..4b2956cad4 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -25,7 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/oui.h>
 
 void proto_register_iapp(void);
 void proto_reg_handoff_iapp(void);
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 9650ba2807..ef218ef6c2 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -72,7 +72,6 @@
 #include <epan/show_exception.h>
 #include <epan/proto_data.h>
 #include <epan/etypes.h>
-#include <epan/oui.h>
 #include <wsutil/pint.h>
 
 /* Use libgcrypt for cipher libraries. */
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index ef4090a5dd..28c2b8ce69 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -43,7 +43,7 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/wmem/wmem.h>
-#include "oui.h"
+#include <epan/oui.h>
 
 
 #define DEFAULT_COLUMN_INFO            1
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 0de3dde134..74091d54d9 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -36,7 +36,6 @@
 #include <epan/etypes.h>
 #include <epan/ipproto.h>
 #include <epan/nlpid.h>
-#include <epan/oui.h>
 #include <epan/afn.h>
 #include <epan/in_cksum.h>
 #include "packet-iana-oui.h"
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 44861800d9..10f09e11fc 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -43,7 +43,6 @@
 #include <epan/crc32-tvb.h>
 #include <epan/ipproto.h>
 #include <epan/addr_resolv.h>
-#include <epan/oui.h>
 #include <epan/reassemble.h>
 #include "packet-sll.h"
 #include "packet-juniper.h"
diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c
index 0992843a15..d4749b7042 100644
--- a/epan/dissectors/packet-thread.c
+++ b/epan/dissectors/packet-thread.c
@@ -32,7 +32,6 @@
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/range.h>
-#include <epan/oui.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <epan/to_str.h>
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c
index 7d1aecb385..e385356c05 100644
--- a/epan/dissectors/packet-wifi-p2p.c
+++ b/epan/dissectors/packet-wifi-p2p.c
@@ -24,7 +24,6 @@
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/expert.h>
-#include <epan/oui.h>
 
 #include "packet-ieee80211.h"