zebra: Recent Merge broke --enable-werror

Recent code broke upon compiling with --enable-dev-build
and --enable-werror.  Fix.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c
index 7215551f8d4369d45c861a3fd5d21dd3af7e78f6..a80c5738551c89dd61c70273e6d9a9c348e0a0bf 100644 (file)
--- a/zebra/zebra_router.c
+++ b/zebra/zebra_router.c
@@ -30,6 +30,7 @@
 #include "zebra_mlag.h"
 #include "zebra_nhg.h"
 #include "debug.h"
+#include "zebra_script.h"
 
 DEFINE_MTYPE_STATIC(ZEBRA, RIB_TABLE_INFO, "RIB table info");
 DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_RT_TABLE, "Zebra VRF table");

diff --git a/zebra/zebra_script.c b/zebra/zebra_script.c
index 574a1c37d766ce28c0c9805ae6742e9de2546ff0..0e19376abe24c491765bc9ae1e186404e43520f2 100644 (file)
--- a/zebra/zebra_script.c
+++ b/zebra/zebra_script.c
@@ -256,7 +256,7 @@ void lua_pushzebra_dplane_ctx(lua_State *L, const struct zebra_dplane_ctx *ctx)
                lua_setfield(L, -2, "rule");
                break;
        case DPLANE_OP_IPTABLE_ADD:
-       case DPLANE_OP_IPTABLE_DELETE:
+       case DPLANE_OP_IPTABLE_DELETE: {
                struct zebra_pbr_iptable iptable;
 
                dplane_ctx_get_pbr_iptable(ctx, &iptable);
@@ -300,10 +300,11 @@ void lua_pushzebra_dplane_ctx(lua_State *L, const struct zebra_dplane_ctx *ctx)
                }
                lua_setfield(L, -2, "iptable");
                break;
+       }
        case DPLANE_OP_IPSET_ADD:
        case DPLANE_OP_IPSET_DELETE:
        case DPLANE_OP_IPSET_ENTRY_ADD:
-       case DPLANE_OP_IPSET_ENTRY_DELETE:
+       case DPLANE_OP_IPSET_ENTRY_DELETE: {
                struct zebra_pbr_ipset ipset;
 
                dplane_ctx_get_pbr_ipset(ctx, &ipset);
@@ -325,8 +326,11 @@ void lua_pushzebra_dplane_ctx(lua_State *L, const struct zebra_dplane_ctx *ctx)
                }
                lua_setfield(L, -2, "ipset");
                break;
+       }
        case DPLANE_OP_ADDR_INSTALL:
        case DPLANE_OP_ADDR_UNINSTALL:
+       case DPLANE_OP_INTF_ADDR_ADD:
+       case DPLANE_OP_INTF_ADDR_DEL:
                break;
        case DPLANE_OP_NEIGH_INSTALL:
        case DPLANE_OP_NEIGH_UPDATE:
@@ -409,6 +413,7 @@ void lua_pushzebra_dplane_ctx(lua_State *L, const struct zebra_dplane_ctx *ctx)
                }
                lua_setfield(L, -2, "gre");
        case DPLANE_OP_NONE:
+               break;
        } /* Dispatch by op code */
 }