diff options
| author |   Pablo Camarillo <pcamaril@cisco.com> | 2017-03-29 07:54:40 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-03-30 12:20:24 +0000 |
| commit | 5d2495d550b220e706b90ff5b42bc8c435be205c (patch) | |
| tree | 4c7b683ee10273ecdc2a15a4000adabf3e6345de /src/vnet | |
| parent | 097051a3bd1f63a177c0728f15375afd84a68918 (diff) | |
VPP-673 Fix L2 steering.
Change-Id: I1eab03525f234139ceefbc9b9895a35a03a56910
Signed-off-by: Pablo Camarillo <pcamaril@cisco.com>
Diffstat (limited to 'src/vnet')
| -rwxr-xr-x | src/vnet/sr/sr_steering.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/vnet/sr/sr_steering.c b/src/vnet/sr/sr_steering.c index a7b0dd199b1..5156b20474c 100755 --- a/src/vnet/sr/sr_steering.c +++ b/src/vnet/sr/sr_steering.c @@ -72,16 +72,14 @@ sr_steering_policy (int is_del, ip6_address_t * bsid, u32 sr_policy_index, memset (&key, 0, sizeof (sr_steering_key_t)); /* Compute the steer policy key */ - if (prefix) + if (traffic_type == SR_STEER_IPV4 || traffic_type == SR_STEER_IPV6) { key.l3.prefix.as_u64[0] = prefix->as_u64[0]; key.l3.prefix.as_u64[1] = prefix->as_u64[1]; key.l3.mask_width = mask_width; key.l3.fib_table = (table_id != (u32) ~ 0 ? table_id : 0); - if (traffic_type != SR_STEER_IPV4 && traffic_type != SR_STEER_IPV6) - return -1; } - else + else if (traffic_type == SR_STEER_L2) { key.l2.sw_if_index = sw_if_index; @@ -94,9 +92,9 @@ sr_steering_policy (int is_del, ip6_address_t * bsid, u32 sr_policy_index, vnet_get_sw_interface (sm->vnet_main, sw_if_index); if (sw->type != VNET_SW_INTERFACE_TYPE_HARDWARE) return -3; - if (traffic_type != SR_STEER_L2) - return -1; } + else + return -1; key.traffic_type = traffic_type; @@ -280,8 +278,7 @@ sr_steering_policy (int is_del, ip6_address_t * bsid, u32 sr_policy_index, goto cleanup_error_encap; if (vnet_feature_enable_disable - ("device-input", "sr-policy-rewrite-encaps-l2", sw_if_index, 1, 0, - 0)) + ("device-input", "sr-pl-rewrite-encaps-l2", sw_if_index, 1, 0, 0)) goto cleanup_error_redirection; /* Set promiscous mode on interface */ @@ -554,13 +551,18 @@ sr_steering_init (vlib_main_t * vm) return 0; } +/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (sr_steering_init); +/* *INDENT-ON* */ -VNET_FEATURE_INIT (sr_policy_rewrite_encaps_l2, static) = +/* *INDENT-OFF* */ +VNET_FEATURE_INIT (sr_pl_rewrite_encaps_l2, static) = { -.arc_name = "device-input",.node_name = - "sr-pl-rewrite-encaps-l2",.runs_before = - VNET_FEATURES ("ethernet-input"),}; + .arc_name = "device-input", + .node_name = "sr-pl-rewrite-encaps-l2", + .runs_before = VNET_FEATURES ("ethernet-input"), +}; +/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON |