From ba4a5bf884516769211e75d11884a1e458323a21 Mon Sep 17 00:00:00 2001
From: Neale Ranns <nranns@cisco.com>
Date: Thu, 9 Jan 2020 06:43:14 +0000
Subject: [PATCH] classify: Reduce the include dependencies on vnet_classify.h

Type: refactor

currently vnet_classify.h is included in ip.h where it's not required.

Change-Id: Id55682637601655aa2edda681536a979c8e323bd
Signed-off-by: Neale Ranns <nranns@cisco.com>
---
 src/vnet/fib/fib_api.c                       | 1 +
 src/vnet/interface_cli.c                     | 1 +
 src/vnet/ip/ip.h                             | 1 -
 src/vnet/ip/ip4_forward.c                    | 1 +
 src/vnet/ip/ip6_forward.c                    | 1 +
 src/vnet/ipfix-export/flow_report_classify.c | 1 +
 src/vnet/l2/l2_rw.c                          | 1 +
 7 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vnet/fib/fib_api.c b/src/vnet/fib/fib_api.c
index 856271f0bc6..54cff9273f0 100644
--- a/src/vnet/fib/fib_api.c
+++ b/src/vnet/fib/fib_api.c
@@ -21,6 +21,7 @@
 #include <vnet/mfib/mfib_table.h>
 #include <vnet/bier/bier_disp_table.h>
 #include <vpp/api/types.h>
+#include <vnet/classify/vnet_classify.h>
 
 #include <vnet/vnet_msg_enum.h>
 
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 1c0d8f5db76..8fb315b4846 100644
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -52,6 +52,7 @@
 #include <vnet/fib/ip6_fib.h>
 #include <vnet/l2/l2_output.h>
 #include <vnet/l2/l2_input.h>
+#include <vnet/classify/vnet_classify.h>
 
 static int
 compare_interface_names (void *a1, void *a2)
diff --git a/src/vnet/ip/ip.h b/src/vnet/ip/ip.h
index 587ec85c229..040e580c3a1 100644
--- a/src/vnet/ip/ip.h
+++ b/src/vnet/ip/ip.h
@@ -64,7 +64,6 @@
 #include <vnet/ip/ip6_packet.h>
 #include <vnet/ip/ip6_error.h>
 #include <vnet/ip/icmp6.h>
-#include <vnet/classify/vnet_classify.h>
 
 /* Per protocol info. */
 typedef struct
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index b8defc56afd..40ae51ccd3b 100644
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -56,6 +56,7 @@
 
 #include <vnet/ip/ip4_forward.h>
 #include <vnet/interface_output.h>
+#include <vnet/classify/vnet_classify.h>
 
 /** @brief IPv4 lookup node.
     @node ip4-lookup
diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 4cb7608d0b4..69ae86d5b2c 100644
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -49,6 +49,7 @@
 #include <vnet/mfib/ip6_mfib.h>
 #include <vnet/dpo/load_balance_map.h>
 #include <vnet/dpo/classify_dpo.h>
+#include <vnet/classify/vnet_classify.h>
 
 #ifndef CLIB_MARCH_VARIANT
 #include <vppinfra/bihash_template.c>
diff --git a/src/vnet/ipfix-export/flow_report_classify.c b/src/vnet/ipfix-export/flow_report_classify.c
index 15118f9cfaa..f004e9a0806 100644
--- a/src/vnet/ipfix-export/flow_report_classify.c
+++ b/src/vnet/ipfix-export/flow_report_classify.c
@@ -15,6 +15,7 @@
 #include <vnet/ipfix-export/flow_report.h>
 #include <vnet/ipfix-export/flow_report_classify.h>
 #include <vnet/api_errno.h>
+#include <vnet/classify/vnet_classify.h>
 
 /* Common prefix of tcp and udp headers
  * containing only source and destination port fields */
diff --git a/src/vnet/l2/l2_rw.c b/src/vnet/l2/l2_rw.c
index e5851404277..3160e65e40d 100644
--- a/src/vnet/l2/l2_rw.c
+++ b/src/vnet/l2/l2_rw.c
@@ -16,6 +16,7 @@
 #include <vlib/vlib.h>
 #include <vnet/l2/feat_bitmap.h>
 #include <vnet/l2/l2_rw.h>
+#include <vnet/classify/vnet_classify.h>
 
 /**
  * @file
-- 
2.16.6