diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-06 16:43:15 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-06 16:43:15 +0100 |
| commit | 666f2cefa19eeef9f7d55f78d7b00a1b597b6c0f (patch) | |
| tree | a7ab37fcdfe3dece758c39be780dca690405c1cf /bgpd/bgp_route.c | |
| parent | bgpd: Fix broken if statement (diff) | |
| download | frr-666f2cefa19eeef9f7d55f78d7b00a1b597b6c0f.tar.xz frr-666f2cefa19eeef9f7d55f78d7b00a1b597b6c0f.zip | |
bgpd: Fix more assignments inside of if statement
Code inspection showed a bunch more spots where
we were assigning the safi inside of a if statement
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to '')
| -rw-r--r-- | bgpd/bgp_route.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 70ef60576..54cc7aa03 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -5267,7 +5267,7 @@ bgp_aggregate_increment (struct bgp *bgp, struct prefix *p, struct bgp_table *table; /* MPLS-VPN aggregation is not yet supported. */ - if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP) || (safi = SAFI_EVPN)) + if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP) || (safi == SAFI_EVPN)) return; table = bgp->aggregate[afi][safi]; @@ -5304,7 +5304,7 @@ bgp_aggregate_decrement (struct bgp *bgp, struct prefix *p, struct bgp_table *table; /* MPLS-VPN aggregation is not yet supported. */ - if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP) || (safi = SAFI_EVPN)) + if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP) || (safi == SAFI_EVPN)) return; table = bgp->aggregate[afi][safi]; @@ -6129,7 +6129,7 @@ route_vty_out (struct vty *vty, struct prefix *p, { json_nexthop_global = json_object_new_object(); - if ((safi == SAFI_MPLS_VPN) || (safi = SAFI_EVPN)) + if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_EVPN)) json_object_string_add(json_nexthop_global, "ip", inet_ntoa (attr->extra->mp_nexthop_global_in)); else json_object_string_add(json_nexthop_global, "ip", inet_ntoa (attr->nexthop)); @@ -6139,7 +6139,7 @@ route_vty_out (struct vty *vty, struct prefix *p, } else { - if ((safi == SAFI_MPLS_VPN) || (safi = SAFI_EVPN)) + if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_EVPN)) vty_out (vty, "%-16s", inet_ntoa (attr->extra->mp_nexthop_global_in)); else |