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.
This commit is contained in:
Paul Jakma 2011-03-29 14:18:49 +01:00
parent f5a4827db6
commit 31d0f1b3c6

View File

@ -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 */
}