aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2017-11-18 06:58:34 -0500
committerDave Barach <dave@barachs.net>2017-11-18 07:25:36 -0500
commit630a8e2aed281f17c1676476637c18aa236317f5 (patch)
tree09b616d53515cce3d10a3c8e8f6d5bfa1a10344f
parent70ed8aeff30c0eece0e19f0ad26c4cc8957278ae (diff)
Rename classifier ip6-sr metadata set action
There's nothing ip6-sr specific about it. Change-Id: I9e3710162bd81b535c46599c988557abf5a5003b Signed-off-by: Dave Barach <dave@barachs.net>
-rw-r--r--src/vnet/classify/vnet_classify.c6
-rw-r--r--src/vnet/classify/vnet_classify.h2
-rw-r--r--src/vnet/ip/ip_input_acl.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c
index d634550bafd..a70782339d4 100644
--- a/src/vnet/classify/vnet_classify.c
+++ b/src/vnet/classify/vnet_classify.c
@@ -373,7 +373,7 @@ vnet_classify_entry_claim_resource (vnet_classify_entry_t *e)
case CLASSIFY_ACTION_SET_IP6_FIB_INDEX:
fib_table_lock (e->metadata, FIB_PROTOCOL_IP6, FIB_SOURCE_CLASSIFY);
break;
- case CLASSIFY_ACTION_SET_SR_POLICY_INDEX:
+ case CLASSIFY_ACTION_SET_METADATA:
break;
}
}
@@ -389,7 +389,7 @@ vnet_classify_entry_release_resource (vnet_classify_entry_t *e)
case CLASSIFY_ACTION_SET_IP6_FIB_INDEX:
fib_table_unlock (e->metadata, FIB_PROTOCOL_IP6, FIB_SOURCE_CLASSIFY);
break;
- case CLASSIFY_ACTION_SET_SR_POLICY_INDEX:
+ case CLASSIFY_ACTION_SET_METADATA:
break;
}
}
@@ -2108,7 +2108,7 @@ int vnet_classify_add_del_session (vnet_classify_main_t * cm,
e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6,
metadata,
FIB_SOURCE_CLASSIFY);
- else if (e->action == CLASSIFY_ACTION_SET_SR_POLICY_INDEX)
+ else if (e->action == CLASSIFY_ACTION_SET_METADATA)
e->metadata = metadata;
else
e->metadata = 0;
diff --git a/src/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h
index c4a5a61364c..4304d33bae8 100644
--- a/src/vnet/classify/vnet_classify.h
+++ b/src/vnet/classify/vnet_classify.h
@@ -66,7 +66,7 @@ typedef enum vnet_classify_action_t_
{
CLASSIFY_ACTION_SET_IP4_FIB_INDEX = 1,
CLASSIFY_ACTION_SET_IP6_FIB_INDEX = 2,
- CLASSIFY_ACTION_SET_SR_POLICY_INDEX = 3,
+ CLASSIFY_ACTION_SET_METADATA = 3,
} __attribute__ ((packed)) vnet_classify_action_t;
struct _vnet_classify_main;
diff --git a/src/vnet/ip/ip_input_acl.c b/src/vnet/ip/ip_input_acl.c
index 1dd5317ee24..4d365a4437f 100644
--- a/src/vnet/ip/ip_input_acl.c
+++ b/src/vnet/ip/ip_input_acl.c
@@ -288,7 +288,7 @@ ip_inacl_inline (vlib_main_t * vm,
if (e0->action == CLASSIFY_ACTION_SET_IP4_FIB_INDEX ||
e0->action == CLASSIFY_ACTION_SET_IP6_FIB_INDEX)
vnet_buffer (b0)->sw_if_index[VLIB_TX] = e0->metadata;
- else if (e0->action == CLASSIFY_ACTION_SET_SR_POLICY_INDEX)
+ else if (e0->action == CLASSIFY_ACTION_SET_METADATA)
vnet_buffer (b0)->ip.adj_index[VLIB_TX] = e0->metadata;
}
else