summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSri Mohana Singamsetty <srimohans@gmail.com>2019-11-13 17:00:51 -0800
committerGitHub <noreply@github.com>2019-11-13 17:00:51 -0800
commit53d19f2d6e45f5e00c2b147fe08bc0e39e8e358c (patch)
treeeed7eb6a449d3ba12e4e2c58e3f81cfa764637e3
parentb6af40b98a5ed65b4b78e6cda650941e5bfdfa7d (diff)
parent207c66836826021418d69a5a8f9f54fdc4ffd257 (diff)
Merge pull request #5309 from donaldsharp/install_nhg_kernel
zebra: Allow zebra to install nexthop groups into linux kernel
-rw-r--r--zebra/rt_netlink.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 915ad1a10c..c9a9a81b18 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -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,