summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-02-28 11:11:39 +0000
committerNeale Ranns <nranns@cisco.com>2019-03-06 12:15:10 +0000
commit4ba67723d716660c56326ce498b99a060a9471b1 (patch)
tree10f2fc773e660bad99ee6b7ae7845b1f23102bb8 /src/vnet
parent6955595a577e1b7d316b5b69267bf1d1d951a4ab (diff)
GBP: use sclass in the DP for policy
Change-Id: I154e18f22ec7708127b8ade98e80546ab1dcd05b Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/buffer.h6
-rw-r--r--src/vnet/interface_format.c4
-rw-r--r--src/vnet/l2/l2_input.h1
-rw-r--r--src/vnet/l2/l2_output.h1
4 files changed, 3 insertions, 9 deletions
diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 7afd16bdfcd..c9b99c9a231 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -391,11 +391,7 @@ typedef struct
{
u8 __unused;
u8 flags;
- union
- {
- u16 src_epg;
- u16 sclass;
- };
+ u16 sclass;
} gbp;
/**
diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c
index 5b20866cce2..2cc10f9b057 100644
--- a/src/vnet/interface_format.c
+++ b/src/vnet/interface_format.c
@@ -578,8 +578,8 @@ 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.src_epg: %d",
- (u32) (o->gbp.flags), (u32) (o->gbp.src_epg));
+ s = format (s, "gbp.flags: %x, gbp.sclass: %d",
+ (u32) (o->gbp.flags), (u32) (o->gbp.sclass));
vec_add1 (s, '\n');
s = format (s, "pg_replay_timestamp: %llu", (u32) (o->pg_replay_timestamp));
diff --git a/src/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h
index 12e7e54038c..93da1277e67 100644
--- a/src/vnet/l2/l2_input.h
+++ b/src/vnet/l2/l2_input.h
@@ -114,7 +114,6 @@ l2input_bd_config (u32 bd_index)
_(GBP_NULL_CLASSIFY, "gbp-null-classify") \
_(GBP_SRC_CLASSIFY, "gbp-src-classify") \
_(GBP_LPM_CLASSIFY, "l2-gbp-lpm-classify") \
- _(GBP_SCLASS_2_ID, "l2-gbp-sclass-2-id") \
_(VTR, "l2-input-vtr") \
_(L2_IP_QOS_RECORD, "l2-ip-qos-record") \
_(VPATH, "vpath-input-l2") \
diff --git a/src/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h
index fdb6167155f..74d2829839f 100644
--- a/src/vnet/l2/l2_output.h
+++ b/src/vnet/l2/l2_output.h
@@ -81,7 +81,6 @@ extern vlib_node_registration_t l2output_node;
#define foreach_l2output_feat \
_(OUTPUT, "interface-output") \
_(SPAN, "span-l2-output") \
- _(GBP_ID_2_SCLASS, "l2-gbp-id-2-sclass") \
_(GBP_POLICY_PORT, "gbp-policy-port") \
_(GBP_POLICY_MAC, "gbp-policy-mac") \
_(CFM, "feature-bitmap-drop") \