diff options
| author | Maria Matejka <mq@ucw.cz> | 2019-07-03 11:09:52 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2019-07-03 11:12:25 +0200 |
| commit | eac9250fd5b10809830361b94438339b3b31b270 (patch) | |
| tree | 5c9ec2591f0baa462f5572f83e4c452c3a166c95 /proto/bgp/attrs.c | |
| parent | 8816b6cdd98d24535eece6b5e35730aac57cd9f7 (diff) | |
| parent | 026bfedb332d8c0dde28c693c177fe993b5df26d (diff) | |
Merge branch 'master' into mq-filter-stack
Diffstat (limited to 'proto/bgp/attrs.c')
| -rw-r--r-- | proto/bgp/attrs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index 7c6f2ee9..69c4b172 100644 --- 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; } |