summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2021-08-19 17:31:05 +0200
committerDonald Sharp <sharpd@nvidia.com>2021-08-19 17:31:05 +0200
commit33c08518737977322c1185e97c94a75ac198726d (patch)
tree8d3357d18f8cc81e2954854c62816af6a78b5b38
parentMerge pull request #9218 from LabNConsulting/chopps/pim-timers (diff)
downloadfrr-33c08518737977322c1185e97c94a75ac198726d.tar.xz
frr-33c08518737977322c1185e97c94a75ac198726d.zip
zebra: Fix usage to enum in notify functions
For some reason commit #ef524230a6baa decided to remove enums and switch to uint16_t. Which is not the right thing to do. Put it back Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to '')
-rw-r--r--zebra/zapi_msg.c7
-rw-r--r--zebra/zapi_msg.h9
2 files changed, 9 insertions, 7 deletions
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 66208bfd8..ddd6a74c0 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -867,7 +867,7 @@ void zsend_rule_notify_owner(const struct zebra_dplane_ctx *ctx,
}
void zsend_iptable_notify_owner(const struct zebra_dplane_ctx *ctx,
- uint16_t note)
+ enum zapi_iptable_notify_owner note)
{
struct listnode *node;
struct zserv *client;
@@ -901,7 +901,8 @@ void zsend_iptable_notify_owner(const struct zebra_dplane_ctx *ctx,
zserv_send_message(client, s);
}
-void zsend_ipset_notify_owner(const struct zebra_dplane_ctx *ctx, uint16_t note)
+void zsend_ipset_notify_owner(const struct zebra_dplane_ctx *ctx,
+ enum zapi_ipset_notify_owner note)
{
struct listnode *node;
struct zserv *client;
@@ -936,7 +937,7 @@ void zsend_ipset_notify_owner(const struct zebra_dplane_ctx *ctx, uint16_t note)
}
void zsend_ipset_entry_notify_owner(const struct zebra_dplane_ctx *ctx,
- uint16_t note)
+ enum zapi_ipset_entry_notify_owner note)
{
struct listnode *node;
struct zserv *client;
diff --git a/zebra/zapi_msg.h b/zebra/zapi_msg.h
index e991dca4f..dad40c200 100644
--- a/zebra/zapi_msg.h
+++ b/zebra/zapi_msg.h
@@ -87,11 +87,12 @@ extern void zsend_rule_notify_owner(const struct zebra_dplane_ctx *ctx,
enum zapi_rule_notify_owner note);
extern void zsend_iptable_notify_owner(const struct zebra_dplane_ctx *ctx,
- uint16_t note);
+ enum zapi_iptable_notify_owner note);
extern void zsend_ipset_notify_owner(const struct zebra_dplane_ctx *ctx,
- uint16_t note);
-extern void zsend_ipset_entry_notify_owner(const struct zebra_dplane_ctx *ctx,
- uint16_t note);
+ enum zapi_ipset_notify_owner note);
+extern void
+zsend_ipset_entry_notify_owner(const struct zebra_dplane_ctx *ctx,
+ enum zapi_ipset_entry_notify_owner note);
extern bool zserv_nexthop_num_warn(const char *caller, const struct prefix *p,
const unsigned int nexthop_num);