From 31d0f1b3c64903d56a47caebf887067d222c7cd6 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Tue, 29 Mar 2011 14:18:49 +0100 Subject: 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. --- bgpd/bgp_attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bgpd') 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 */ } -- cgit v1.2.1