From: Paul Jakma Date: Tue, 29 Mar 2011 13:18:49 +0000 (+0100) Subject: bgpd: Fix merge error in jhash commit X-Git-Tag: frr-2.0-rc1~2077 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=31d0f1b3c64903d56a47caebf887067d222c7cd6;p=matthieu%2Ffrr.git 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. --- diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 7e302652ce..01598c87b4 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 */ }