diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-09-12 21:58:39 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-09-12 21:58:39 +0200 |
| commit | e991eff5b5773e8a85c3f4c4f92c09fe30cf680b (patch) | |
| tree | ab98bf44cfc7611ad7cc699396674554f150db43 /zebra/zebra_vxlan.c | |
| parent | zebra: fix includes (diff) | |
| parent | Merge pull request #3005 from patrasar/indentation_warnings (diff) | |
| download | frr-e991eff5b5773e8a85c3f4c4f92c09fe30cf680b.tar.xz frr-e991eff5b5773e8a85c3f4c4f92c09fe30cf680b.zip | |
Merge remote-tracking branch 'frr/master' into warnings
Conflicts:
zebra/if_ioctl_solaris.c
zebra/rtread_getmsg.c
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'zebra/zebra_vxlan.c')
| -rw-r--r-- | zebra/zebra_vxlan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 1570edcad..a0a90ac28 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -207,6 +207,9 @@ static int host_rb_entry_compare(const struct host_rb_entry *hle1, return 1; return 0; + } else if (hle1->p.family == AF_INET6) { + return memcmp(&hle1->p.u.prefix6, &hle2->p.u.prefix6, + IPV6_MAX_BYTELEN); } else { zlog_debug("%s: Unexpected family type: %d", __PRETTY_FUNCTION__, hle1->p.family); |