diff options
| author | Paul Jakma <paul@quagga.net> | 2011-03-29 14:18:49 +0100 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2011-03-29 14:18:49 +0100 |
| commit | 31d0f1b3c64903d56a47caebf887067d222c7cd6 (patch) | |
| tree | 7a7d90f0517bc2816fc0279f79b5d7a9ab195095 /bgpd | |
| parent | f5a4827db60545309d0ee378b85acac56cf7837a (diff) | |
bgpd: Fix merge error in jhash commit
* bgp_attr.c: (attrhash_key_make) 98e30f should have changed jhash2 to jhash.
These kinds of merge errors would be reduced and life would be easier if
people would submit fully-formed fixes that could be chucked directly into
git-am.
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_attr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 7e302652..01598c87 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -373,8 +373,8 @@ attrhash_key_make (void *p) #ifdef HAVE_IPV6 MIX(attr->extra->mp_nexthop_len); - key = jhash2(attr->extra->mp_nexthop_global.s6_addr, 16, key); - key = jhash2(attr->extra->mp_nexthop_local.s6_addr, 16, key); + key = jhash(attr->extra->mp_nexthop_global.s6_addr, 16, key); + key = jhash(attr->extra->mp_nexthop_local.s6_addr, 16, key); #endif /* HAVE_IPV6 */ } |