From 657b9e3e4d0b5580384974f7aa6ef58226cbbc4a Mon Sep 17 00:00:00 2001
From: Neale Ranns <neale@graphiant.com>
Date: Fri, 31 Dec 2021 10:37:45 +0000
Subject: misc: Remove the unused GBP fields from the buffer meta-data

Type: refactor

Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: I92496501360ee073795206bde87f4731a5ce074c
---
 src/plugins/mdata/mdata.c   |  2 --
 src/vnet/buffer.h           | 10 +---------
 src/vnet/interface_format.c |  4 ----
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/plugins/mdata/mdata.c b/src/plugins/mdata/mdata.c
index ba8f85f5177..7e178625b22 100644
--- a/src/plugins/mdata/mdata.c
+++ b/src/plugins/mdata/mdata.c
@@ -354,8 +354,6 @@ _(snat.flags)
 _(qos.bits)                                     \
 _(qos.source)                                   \
 _(loop_counter)                                 \
-_(gbp.flags)                                    \
-_(gbp.sclass)                                   \
 _(gso_size)                                     \
 _(gso_l4_hdr_sz)                                \
 _(pg_replay_timestamp)
diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 594c6083b84..aa5d12e0754 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -467,15 +467,7 @@ typedef struct
   } qos;
 
   u8 loop_counter;
-  u8 __unused[1];
-
-  /* Group Based Policy */
-  struct
-  {
-    u8 __unused;
-    u8 flags;
-    u16 sclass;
-  } gbp;
+  u8 __unused[5];
 
   /**
    * The L4 payload size set on input on GSO enabled interfaces
diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c
index cb428e761be..d1fe9b877bb 100644
--- a/src/vnet/interface_format.c
+++ b/src/vnet/interface_format.c
@@ -697,10 +697,6 @@ format_vnet_buffer_opaque2 (u8 * s, va_list * args)
   s = format (s, "loop_counter: %d", o->loop_counter);
   vec_add1 (s, '\n');
 
-  s = format (s, "gbp.flags: %x, gbp.sclass: %d",
-	      (u32) (o->gbp.flags), (u32) (o->gbp.sclass));
-  vec_add1 (s, '\n');
-
   s = format (s, "gso_size: %d, gso_l4_hdr_sz: %d",
 	      (u32) (o->gso_size), (u32) (o->gso_l4_hdr_sz));
   vec_add1 (s, '\n');
-- 
cgit 1.2.3-korg