summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2021-11-07 11:00:36 -0500
committerGitHub <noreply@github.com>2021-11-07 11:00:36 -0500
commit9b0b69112e31de81907d8462811021dabadcd387 (patch)
tree5c28a08633dce4c41023382cfc556454b26bb854
parent3691c9d2d0b22e4fa27d7a49b302f28b1af9ede0 (diff)
parentfae857d4a42eebaf4630b5aa2d22b09d5bd85c19 (diff)
Merge pull request #9992 from FRRouting/mergify/bp/stable/8.1/pr-9954
zebra: Send up ifindex for redistribution when appropriate (backport #9954)
-rw-r--r--zebra/zapi_msg.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 496849251a..b839d1d754 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -604,8 +604,6 @@ int zsend_redistribute_route(int cmd, struct zserv *client,
api_nh->bh_type = nexthop->bh_type;
break;
case NEXTHOP_TYPE_IPV4:
- api_nh->gate.ipv4 = nexthop->gate.ipv4;
- break;
case NEXTHOP_TYPE_IPV4_IFINDEX:
api_nh->gate.ipv4 = nexthop->gate.ipv4;
api_nh->ifindex = nexthop->ifindex;
@@ -614,8 +612,6 @@ int zsend_redistribute_route(int cmd, struct zserv *client,
api_nh->ifindex = nexthop->ifindex;
break;
case NEXTHOP_TYPE_IPV6:
- api_nh->gate.ipv6 = nexthop->gate.ipv6;
- break;
case NEXTHOP_TYPE_IPV6_IFINDEX:
api_nh->gate.ipv6 = nexthop->gate.ipv6;
api_nh->ifindex = nexthop->ifindex;