diff options
| author | Russ White <russ@riw.us> | 2024-10-08 17:45:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-08 17:45:27 +0200 |
| commit | b8c458622d2fb8ed221af2295dc1c1811fc2cbde (patch) | |
| tree | 31655dd9cb711558c2d9a47ad21e13509dccb96c /pimd | |
| parent | Merge pull request #17009 from donaldsharp/pw_cleanup (diff) | |
| parent | *: Allow 16 bit size for nexthops (diff) | |
| download | frr-b8c458622d2fb8ed221af2295dc1c1811fc2cbde.tar.xz frr-b8c458622d2fb8ed221af2295dc1c1811fc2cbde.zip | |
Merge pull request #17023 from donaldsharp/dplane_problemsbase_10.2
zebra: Allow dplane to pass larger number of nexthops down to dataplane
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_nht.c | 4 | ||||
| -rw-r--r-- | pimd/pim_nht.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index 030b933e0..5a161c4f1 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -573,7 +573,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, ifindex_t first_ifindex; struct interface *ifp = NULL; uint32_t hash_val = 0, mod_val = 0; - uint8_t nh_iter = 0, found = 0; + uint16_t nh_iter = 0, found = 0; uint32_t i, num_nbrs = 0; struct pim_interface *pim_ifp; @@ -947,7 +947,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, struct interface *ifps[router->multipath], *ifp; int first_ifindex; int found = 0; - uint8_t i = 0; + uint16_t i = 0; uint32_t hash_val = 0, mod_val = 0; uint32_t num_nbrs = 0; struct pim_interface *pim_ifp; diff --git a/pimd/pim_nht.h b/pimd/pim_nht.h index e74b375dc..d064f714a 100644 --- a/pimd/pim_nht.h +++ b/pimd/pim_nht.h @@ -23,7 +23,7 @@ struct pim_nexthop_cache { uint32_t metric; uint32_t distance; /* Nexthop number and nexthop linked list. */ - uint8_t nexthop_num; + uint16_t nexthop_num; struct nexthop *nexthop; int64_t last_update; uint16_t flags; |