From 4b6bd01dda84a0df492588efecb0a49eac150de5 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Wed, 10 Jul 2019 09:10:59 +0200
Subject: [PATCH] generic -> controller

---
 p4src/{actions_generic.p4 => actions_controller.p4} | 4 ++--
 p4src/actions_nat64_generic.p4                      | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename p4src/{actions_generic.p4 => actions_controller.p4} (90%)

diff --git a/p4src/actions_generic.p4 b/p4src/actions_controller.p4
similarity index 90%
rename from p4src/actions_generic.p4
rename to p4src/actions_controller.p4
index a6fbabf..9c463cd 100644
--- a/p4src/actions_generic.p4
+++ b/p4src/actions_controller.p4
@@ -1,5 +1,5 @@
-#ifndef NICO_GENERIC
-#define NICO_GENERIC
+#ifndef NICO_CONTROLLER
+#define NICO_CONTROLLER
 
 /********************** GENERAL ACTIONS ***********************************/
 
diff --git a/p4src/actions_nat64_generic.p4 b/p4src/actions_nat64_generic.p4
index 680f4b9..16dbeba 100644
--- a/p4src/actions_nat64_generic.p4
+++ b/p4src/actions_nat64_generic.p4
@@ -1,6 +1,8 @@
 #ifndef NICO_NAT64_GENERIC
 #define NICO_NAT64_GENERIC
 
+#include "actions_controller.p4"
+
 /********************** NAT64 / NAT46 ACTIONS GENERIC ***********************************/
 
     /* changes for icmp6 -> icmp */