From 7e9dbe69da0a2eed9a89136b2fac1fcb9d1f4186 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Tue, 23 Jul 2019 16:10:28 +0200
Subject: [PATCH] revert to user_metadata_t for this test

---
 p4src/minip4_solution.p4 | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/p4src/minip4_solution.p4 b/p4src/minip4_solution.p4
index 831b7eb..e9af07f 100644
--- a/p4src/minip4_solution.p4
+++ b/p4src/minip4_solution.p4
@@ -72,14 +72,15 @@ parser TopParser(packet_in packet,
 */
 
 // control TopPipe(inout Parsed_packet p,
-//                 inout user_metadata_t user_metadata,
+
 //                 inout digest_data_t digest_data,
 //                 inout sume_metadata_t sume_metadata) {
 
 control TopPipe(inout headers hdr,
-                inout metadata meta,
-                inout digest_data_t digest_data,
-                inout sume_metadata_t sume_metadata) {
+        //inout metadata meta,
+        inout user_metadata_t user_metadata,
+        inout digest_data_t digest_data,
+        inout sume_metadata_t sume_metadata) {
 
     // actions to be enabled
     // #include "actions_nat64_generic.p4"    // includes controller & delta checksum
@@ -242,15 +243,16 @@ control TopPipe(inout headers hdr,
 
 @Xilinx_MaxPacketRegion(1024)
 control TopDeparser(packet_out packet,
-                    in headers hdr,
-                    in metadata meta,
-                    inout digest_data_t digest_data,
-                    inout sume_metadata_t sume_metadata) {
+        in headers hdr,
+        in user_metadata_t user_metadata,
+//        in metadata meta,
+        inout digest_data_t digest_data,
+        inout sume_metadata_t sume_metadata) {
 
 // @Xilinx_MaxPacketRegion(1024)
 // control TopDeparser(packet_out b,
 //             in Parsed_packet p,
-//             in user_metadata_t user_metadata,
+
 //             inout digest_data_t digest_data,
 //             inout sume_metadata_t sume_metadata) {