X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fspan%2Fspan_api.c;h=64a71a2ed69916ecdc749b5d14ac3bc1a0003d50;hb=5b311202b82a827c712d2cb7604c56049266adc9;hp=69fa8e974fae3bab87910be0bc9cf04b551e093e;hpb=b88566498a83209f8646e4a6b1d247e69dae2aeb;p=vpp.git

diff --git a/src/vnet/span/span_api.c b/src/vnet/span/span_api.c
index 69fa8e974fa..64a71a2ed69 100644
--- a/src/vnet/span/span_api.c
+++ b/src/vnet/span/span_api.c
@@ -75,16 +75,17 @@ vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp)
   if (!q)
     return;
 
+  span_feat_t sf = mp->is_l2 ? SPAN_FEAT_L2 : SPAN_FEAT_DEVICE;
   /* *INDENT-OFF* */
   vec_foreach (si, sm->interfaces)
   {
-  span_mirror_t * drxm = &si->mirror_rxtx[SPAN_FEAT_DEVICE][VLIB_RX];
-  span_mirror_t * dtxm = &si->mirror_rxtx[SPAN_FEAT_DEVICE][VLIB_TX];
-    if (drxm->num_mirror_ports || dtxm->num_mirror_ports)
+    span_mirror_t * rxm = &si->mirror_rxtx[sf][VLIB_RX];
+    span_mirror_t * txm = &si->mirror_rxtx[sf][VLIB_TX];
+    if (rxm->num_mirror_ports || txm->num_mirror_ports)
     {
       clib_bitmap_t *b;
       u32 i;
-      b = clib_bitmap_dup_or (drxm->mirror_ports, dtxm->mirror_ports);
+      b = clib_bitmap_dup_or (rxm->mirror_ports, txm->mirror_ports);
       clib_bitmap_foreach (i, b, (
         {
           rmp = vl_msg_api_alloc (sizeof (*rmp));
@@ -94,8 +95,8 @@ vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp)
 
           rmp->sw_if_index_from = htonl (si - sm->interfaces);
           rmp->sw_if_index_to = htonl (i);
-          rmp->state = (u8) (clib_bitmap_get (drxm->mirror_ports, i) +
-                             clib_bitmap_get (dtxm->mirror_ports, i) * 2);
+          rmp->state = (u8) (clib_bitmap_get (rxm->mirror_ports, i) +
+                             clib_bitmap_get (txm->mirror_ports, i) * 2);
 
           vl_msg_api_send_shmem (q, (u8 *) & rmp);
         }));