Merge branch 'master' into mq-filter-stack

[thirdparty/bird.git] / proto / bgp / attrs.c

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 7c6f2ee9d308325c2798f6c917982b89ab928dde..69c4b1722578d16f8ab3d22be52f5a40d9e19f05 100644 (file)
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1302,7 +1302,7 @@ bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b)
 #define PXH_FN(n,i,h)          h
 
 #define PXH_REHASH             bgp_pxh_rehash
-#define PXH_PARAMS             /8, *2, 2, 2, 8, 20
+#define PXH_PARAMS             /8, *2, 2, 2, 8, 24
 
 
 HASH_DEFINE_REHASH_FN(PXH, struct bgp_prefix)
@@ -1730,7 +1730,7 @@ bgp_rte_better(rte *new, rte *old)
     return 0;
 
   /* RFC 4271 9.1.2.2. g) Compare peer IP adresses */
-  return (ipa_compare(new_bgp->cf->remote_ip, old_bgp->cf->remote_ip) < 0);
+  return ipa_compare(new_bgp->remote_ip, old_bgp->remote_ip) < 0;
 }