diff options
| author | Russ White <russ@riw.us> | 2017-09-13 16:18:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 16:18:41 -0400 |
| commit | dcc4574ae63716e15c5a6df7f76a3e01eea70afe (patch) | |
| tree | 3b193c225a6e61e7ac6472225c33b37b3a56354b /zebra/rt_socket.c | |
| parent | 7577536c5c2dfb78f7af01cdb6d980023efccb18 (diff) | |
| parent | 14a481d9165c6abf5167bc4636ce49aec7cede13 (diff) | |
Merge pull request #1163 from donaldsharp/deduplicate_nexthops
zebra: deduplicate nexthops
Diffstat (limited to 'zebra/rt_socket.c')
| -rw-r--r-- | zebra/rt_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index d8e37a10c3..75207a2dde 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -136,7 +136,7 @@ static int kernel_rtm_ipv4(int cmd, struct prefix *p, struct route_entry *re) * other than ADD and DELETE? */ if ((cmd == RTM_ADD - && CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE)) + && NEXTHOP_IS_ACTIVE(nexthop->flags)) || (cmd == RTM_DELETE && CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB))) { if (nexthop->type == NEXTHOP_TYPE_IPV4 @@ -314,7 +314,7 @@ static int kernel_rtm_ipv6(int cmd, struct prefix *p, struct route_entry *re) gate = 0; if ((cmd == RTM_ADD - && CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE)) + && NEXTHOP_IS_ACTIVE(nexthop->flags)) || (cmd == RTM_DELETE #if 0 && CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB) |