Merge pull request #14702 from FRRouting/mergify/bp/dev/9.1/pr-14675

zebra: Add encap type when building packet for FPM (backport #14675)
This commit is contained in:
Donald Sharp 2023-10-31 11:59:22 -04:00 committed by GitHub
commit d0a8f8074a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2412,19 +2412,21 @@ ssize_t netlink_route_multipath_msg_encode(int cmd, struct zebra_dplane_ctx *ctx
p, routedesc, bytelen, nexthop,
&req->n, &req->r, datalen, cmd))
return 0;
/*
* Add encapsulation information when
* installing via FPM.
*/
if (fpm) {
if (!netlink_route_nexthop_encap(&req->n,
datalen,
nexthop))
return 0;
}
nexthop_num++;
break;
}
/*
* Add encapsulation information when installing via
* FPM.
*/
if (fpm) {
if (!netlink_route_nexthop_encap(
&req->n, datalen, nexthop))
return 0;
}
}
if (setsrc) {