X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbier%2Fbier_fmask.c;h=b7fca4dca2377735dd7032d7eba73462737f0292;hb=ddb192951c160c7bdb2c630a781b9a4878dae09a;hp=b6169d3c4bb3456294538977b5dd085413f11157;hpb=8feeaff56fa9a4fbdfc06131f28a1060ffd9645d;p=vpp.git

diff --git a/src/vnet/bier/bier_fmask.c b/src/vnet/bier/bier_fmask.c
index b6169d3c4bb..b7fca4dca23 100644
--- a/src/vnet/bier/bier_fmask.c
+++ b/src/vnet/bier/bier_fmask.c
@@ -404,7 +404,7 @@ bier_fmask_get_stats (index_t bfmi, u64 * packets, u64 * bytes)
 void
 bier_fmask_encode (index_t bfmi,
                    bier_table_id_t *btid,
-                   fib_route_path_encode_t *rpath)
+                   fib_route_path_t *rpath)
 {
     bier_fmask_t *bfm;
 
@@ -413,17 +413,17 @@ bier_fmask_encode (index_t bfmi,
 
     clib_memset(rpath, 0, sizeof(*rpath));
 
-    rpath->rpath.frp_sw_if_index = ~0;
+    rpath->frp_sw_if_index = ~0;
 
     switch (bfm->bfm_id->bfmi_nh_type)
     {
     case BIER_NH_UDP:
-        rpath->rpath.frp_flags = FIB_ROUTE_PATH_UDP_ENCAP;
-        rpath->rpath.frp_udp_encap_id = bfm->bfm_id->bfmi_id;
+        rpath->frp_flags = FIB_ROUTE_PATH_UDP_ENCAP;
+        rpath->frp_udp_encap_id = bfm->bfm_id->bfmi_id;
         break;
     case BIER_NH_IP:
-        memcpy(&rpath->rpath.frp_addr, &bfm->bfm_id->bfmi_nh,
-               sizeof(rpath->rpath.frp_addr));
+        memcpy(&rpath->frp_addr, &bfm->bfm_id->bfmi_nh,
+               sizeof(rpath->frp_addr));
         break;
     }
 }
@@ -556,12 +556,12 @@ bier_fmask_show (vlib_main_t * vm,
 
     if (INDEX_INVALID == bfmi)
     {
-        pool_foreach(bfm, bier_fmask_pool,
-        ({
+        pool_foreach (bfm, bier_fmask_pool)
+         {
             vlib_cli_output (vm, "[@%d] %U",
                              bier_fmask_get_index(bfm),
                              format_bier_fmask, bier_fmask_get_index(bfm), 0);
-        }));
+        }
     }
     else
     {