proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 10:04:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zebra/rt_netlink.c
View File

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