diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-13 14:48:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 14:48:16 -0500 |
| commit | 9aa7f43f7e7310c285f39a38ff36e1546c00058c (patch) | |
| tree | cdcfdc0f188027cd77937c790895fc5926bb85dd /bgpd/rfapi/rfapi_import.c | |
| parent | 386ea4d526de953f3648dfa286f77e5b0a8eef12 (diff) | |
| parent | b6f1faf04596242329d8ecd95b732f1d396e7823 (diff) | |
Merge branch 'master' into cleanup
Diffstat (limited to 'bgpd/rfapi/rfapi_import.c')
| -rw-r--r-- | bgpd/rfapi/rfapi_import.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c index 25c05e65f8..716a1fb537 100644 --- a/bgpd/rfapi/rfapi_import.c +++ b/bgpd/rfapi/rfapi_import.c @@ -4086,7 +4086,6 @@ rfapiBgpInfoFilteredImportFunction (safi_t safi) switch (safi) { case SAFI_MPLS_VPN: - case BGP_SAFI_VPN: return rfapiBgpInfoFilteredImportVPN; case SAFI_ENCAP: @@ -4203,7 +4202,7 @@ rfapiProcessUpdate ( label); } - if (safi == SAFI_MPLS_VPN || safi == BGP_SAFI_VPN) + if (safi == SAFI_MPLS_VPN) { vnc_direct_bgp_rh_add_route (bgp, afi, p, peer, attr); } @@ -4332,7 +4331,7 @@ rfapiProcessWithdraw ( } /* TBD the deletion should happen after the lifetime expires */ - if (safi == SAFI_MPLS_VPN || safi == BGP_SAFI_VPN) + if (safi == SAFI_MPLS_VPN) vnc_direct_bgp_rh_del_route (bgp, afi, p, peer); if (safi == SAFI_MPLS_VPN) |