diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-16 14:44:45 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-16 14:44:45 +0200 |
| commit | abced4a91495e27fe86b142bc1967cec53bab3dc (patch) | |
| tree | f6aead6b370caf7515855726e4e54ca7ee95224c /proto/bgp/attrs.c | |
| parent | fc06fb62443c135773ee4c05ed83925cc47b046d (diff) | |
| parent | 761702644397886bd3c1be10fd55c01485b7c454 (diff) | |
Merge branch 'rt-accepted'
Conflicts:
nest/config.Y
nest/rt-table.c
proto/bgp/bgp.c
Diffstat (limited to 'proto/bgp/attrs.c')
| -rw-r--r-- | proto/bgp/attrs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index 4495c039..e5bc84dd 100644 --- a/proto/bgp/attrs.c +++ b/proto/bgp/attrs.c @@ -1258,7 +1258,8 @@ same_group(rte *r, u32 lpref, u32 lasn) static inline int use_deterministic_med(rte *r) { - return ((struct bgp_proto *) r->attrs->proto)->cf->deterministic_med; + struct proto *P = r->attrs->proto; + return (P->proto == &proto_bgp) && ((struct bgp_proto *) P)->cf->deterministic_med; } int |