diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-01-21 23:34:18 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-01-22 14:37:51 +0000 |
| commit | 879d11c250a4710759ddefe22afd7fc05bda2946 (patch) | |
| tree | 86f1984cf7324e05d8b100f9201ea69df83edc56 /src/vnet/vxlan-gbp | |
| parent | 03ae24b97498bcc9265d4650efe3ddaa5e1d3255 (diff) | |
GBP: Sclass to src-epg conversions
Change-Id: Ica88268fd6a6ee01da7e9219bb4e81f22ed2fd4b
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/vxlan-gbp')
| -rw-r--r-- | src/vnet/vxlan-gbp/decap.c | 6 | ||||
| -rw-r--r-- | src/vnet/vxlan-gbp/encap.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/vnet/vxlan-gbp/decap.c b/src/vnet/vxlan-gbp/decap.c index 613cb012319..6c14ef79531 100644 --- a/src/vnet/vxlan-gbp/decap.c +++ b/src/vnet/vxlan-gbp/decap.c @@ -334,7 +334,7 @@ vxlan_gbp_input (vlib_main_t * vm, } vnet_buffer2 (b0)->gbp.flags = vxlan_gbp_get_gpflags (vxlan_gbp0); - vnet_buffer2 (b0)->gbp.src_epg = vxlan_gbp_get_sclass (vxlan_gbp0); + vnet_buffer2 (b0)->gbp.sclass = vxlan_gbp_get_sclass (vxlan_gbp0); if (PREDICT_FALSE @@ -369,7 +369,7 @@ vxlan_gbp_input (vlib_main_t * vm, } vnet_buffer2 (b1)->gbp.flags = vxlan_gbp_get_gpflags (vxlan_gbp1); - vnet_buffer2 (b1)->gbp.src_epg = vxlan_gbp_get_sclass (vxlan_gbp1); + vnet_buffer2 (b1)->gbp.sclass = vxlan_gbp_get_sclass (vxlan_gbp1); vnet_update_l2_len (b0); vnet_update_l2_len (b1); @@ -473,7 +473,7 @@ vxlan_gbp_input (vlib_main_t * vm, (rx_counter, thread_index, stats_t0->sw_if_index, 1, len0); } vnet_buffer2 (b0)->gbp.flags = vxlan_gbp_get_gpflags (vxlan_gbp0); - vnet_buffer2 (b0)->gbp.src_epg = vxlan_gbp_get_sclass (vxlan_gbp0); + vnet_buffer2 (b0)->gbp.sclass = vxlan_gbp_get_sclass (vxlan_gbp0); /* Required to make the l2 tag push / pop code work on l2 subifs */ vnet_update_l2_len (b0); diff --git a/src/vnet/vxlan-gbp/encap.c b/src/vnet/vxlan-gbp/encap.c index f1b839ce316..f8fc9b4b998 100644 --- a/src/vnet/vxlan-gbp/encap.c +++ b/src/vnet/vxlan-gbp/encap.c @@ -260,9 +260,9 @@ vxlan_gbp_encap_inline (vlib_main_t * vm, vxlan_gbp0->gpflags = vnet_buffer2 (b0)->gbp.flags; vxlan_gbp1->gpflags = vnet_buffer2 (b1)->gbp.flags; vxlan_gbp0->sclass = - clib_host_to_net_u16 (vnet_buffer2 (b0)->gbp.src_epg); + clib_host_to_net_u16 (vnet_buffer2 (b0)->gbp.sclass); vxlan_gbp1->sclass = - clib_host_to_net_u16 (vnet_buffer2 (b1)->gbp.src_epg); + clib_host_to_net_u16 (vnet_buffer2 (b1)->gbp.sclass); if (csum_offload) { @@ -324,7 +324,7 @@ vxlan_gbp_encap_inline (vlib_main_t * vm, vlib_add_trace (vm, node, b0, sizeof (*tr)); tr->tunnel_index = t0 - vxm->tunnels; tr->vni = t0->vni; - tr->sclass = vnet_buffer2 (b0)->gbp.src_epg; + tr->sclass = vnet_buffer2 (b0)->gbp.sclass; tr->flags = vnet_buffer2 (b0)->gbp.flags; } @@ -334,7 +334,7 @@ vxlan_gbp_encap_inline (vlib_main_t * vm, vlib_add_trace (vm, node, b1, sizeof (*tr)); tr->tunnel_index = t1 - vxm->tunnels; tr->vni = t1->vni; - tr->sclass = vnet_buffer2 (b1)->gbp.src_epg; + tr->sclass = vnet_buffer2 (b1)->gbp.sclass; tr->flags = vnet_buffer2 (b1)->gbp.flags; } @@ -426,7 +426,7 @@ vxlan_gbp_encap_inline (vlib_main_t * vm, /* set source class and gpflags */ vxlan_gbp0->gpflags = vnet_buffer2 (b0)->gbp.flags; vxlan_gbp0->sclass = - clib_host_to_net_u16 (vnet_buffer2 (b0)->gbp.src_epg); + clib_host_to_net_u16 (vnet_buffer2 (b0)->gbp.sclass); if (csum_offload) { @@ -469,7 +469,7 @@ vxlan_gbp_encap_inline (vlib_main_t * vm, vlib_add_trace (vm, node, b0, sizeof (*tr)); tr->tunnel_index = t0 - vxm->tunnels; tr->vni = t0->vni; - tr->sclass = vnet_buffer2 (b0)->gbp.src_epg; + tr->sclass = vnet_buffer2 (b0)->gbp.sclass; tr->flags = vnet_buffer2 (b0)->gbp.flags; } vlib_validate_buffer_enqueue_x1 (vm, node, next_index, |