diff options
| author | Russ White <russ@riw.us> | 2018-09-24 10:54:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 10:54:16 -0400 |
| commit | a1b32de24ed520a53499f6e81d6ee8eaac548bd1 (patch) | |
| tree | 5ce26f8b92502977830006b7d8e99fba93cd7970 /zebra/rt_socket.c | |
| parent | b3630e8436656d6be6d65c5cc67690a19159087a (diff) | |
| parent | 5be41a1c8b25cf3fe9190267ba86ce80780bd5bd (diff) | |
Merge pull request #3052 from donaldsharp/dplane_2
Dplane 2
Diffstat (limited to 'zebra/rt_socket.c')
| -rw-r--r-- | zebra/rt_socket.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index e733b4b26e..e8d0b71605 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -391,18 +391,18 @@ static int kernel_rtm(int cmd, const struct prefix *p, struct route_entry *re) return 0; } -enum dp_req_result kernel_route_rib(struct route_node *rn, - const struct prefix *p, - const struct prefix *src_p, - struct route_entry *old, - struct route_entry *new) +enum zebra_dplane_result kernel_route_rib(struct route_node *rn, + const struct prefix *p, + const struct prefix *src_p, + struct route_entry *old, + struct route_entry *new) { int route = 0; if (src_p && src_p->prefixlen) { flog_warn(EC_ZEBRA_UNSUPPORTED_V6_SRCDEST, "%s: IPv6 sourcedest routes unsupported!", __func__); - return DP_REQUEST_FAILURE; + return ZEBRA_DPLANE_REQUEST_FAILURE; } frr_elevate_privs(&zserv_privs) { @@ -418,16 +418,16 @@ enum dp_req_result kernel_route_rib(struct route_node *rn, if (new) { kernel_route_rib_pass_fail( rn, p, new, - (!route) ? DP_INSTALL_SUCCESS - : DP_INSTALL_FAILURE); + (!route) ? ZEBRA_DPLANE_INSTALL_SUCCESS + : ZEBRA_DPLANE_INSTALL_FAILURE); } else { kernel_route_rib_pass_fail(rn, p, old, (!route) - ? DP_DELETE_SUCCESS - : DP_DELETE_FAILURE); + ? ZEBRA_DPLANE_DELETE_SUCCESS + : ZEBRA_DPLANE_DELETE_FAILURE); } - return DP_REQUEST_SUCCESS; + return ZEBRA_DPLANE_REQUEST_SUCCESS; } int kernel_neigh_update(int add, int ifindex, uint32_t addr, char *lla, |