proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 01:47:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10580 from leonshaw/fix/link-ns

Browse Source 
zebra: Lookup linked interface in link netns
This commit is contained in:
Donald Sharp 2022-03-15 15:23:18 -04:00 committed by GitHub
commit 2ea93eb023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/if_netlink.c
View File

@ -1834,7 +1834,7 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
ZEBRA_INTERFACE_VRF_LOOPBACK); ZEBRA_INTERFACE_VRF_LOOPBACK);
/* Update link. */ /* Update link. */
zebra_if_update_link(ifp, link_ifindex, ns_id); zebra_if_update_link(ifp, link_ifindex, link_nsid);
ifp->ll_type = ifp->ll_type =
netlink_to_zebra_link_type(ifi->ifi_type); netlink_to_zebra_link_type(ifi->ifi_type);
@ -1904,7 +1904,7 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
memcpy(old_hw_addr, ifp->hw_addr, INTERFACE_HWADDR_MAX); memcpy(old_hw_addr, ifp->hw_addr, INTERFACE_HWADDR_MAX);
/* Update link. */ /* Update link. */
zebra_if_update_link(ifp, link_ifindex, ns_id); zebra_if_update_link(ifp, link_ifindex, link_nsid);
ifp->ll_type = ifp->ll_type =
netlink_to_zebra_link_type(ifi->ifi_type); netlink_to_zebra_link_type(ifi->ifi_type);