Merge pull request #5309 from donaldsharp/install_nhg_kernel

zebra: Allow zebra to install nexthop groups into linux kernel
This commit is contained in:
Sri Mohana Singamsetty 2019-11-13 17:00:51 -08:00 committed by GitHub
commit 53d19f2d6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2456,7 +2456,6 @@ int netlink_nexthop_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
return 0;
}
#if 0 /* Force off kernel nexthop group installs for now */
/**
* netlink_request_nexthop() - Request nextop information from the kernel
* @zns: Zebra namespace
@ -2515,12 +2514,6 @@ int netlink_nexthop_read(struct zebra_ns *zns)
return ret;
}
#else
int netlink_nexthop_read(struct zebra_ns *zns)
{
return 0;
}
#endif
int kernel_neigh_update(int add, int ifindex, uint32_t addr, char *lla,