diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-11-23 11:43:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-23 11:43:48 +0200 |
| commit | 0ecdbedbf95125e358298fd9cc502560a74c0c4a (patch) | |
| tree | 8a313c95efbdfa40f99253c7d5a26bd258bba658 /ospfd/ospf_ldp_sync.c | |
| parent | f1189d7374075cee09d19182ac7ebdd7a40a345c (diff) | |
| parent | 096f7609f9168ad1a2503acad31d3afc8f00f9e5 (diff) | |
Merge pull request #10040 from idryzhov/ifp-vrf-id-cleanup
*: cleanup ifp->vrf_id
Diffstat (limited to 'ospfd/ospf_ldp_sync.c')
| -rw-r--r-- | ospfd/ospf_ldp_sync.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c index dbd45635b2..7471ba7ba2 100644 --- a/ospfd/ospf_ldp_sync.c +++ b/ospfd/ospf_ldp_sync.c @@ -129,8 +129,9 @@ void ospf_ldp_sync_if_init(struct ospf_interface *oi) * if LDP-IGP Sync is configured globally set state * if ptop interface inform LDP LDP-SYNC is enabled */ - if (if_is_loopback(ifp) || (ifp->vrf_id != VRF_DEFAULT) || - !(CHECK_FLAG(oi->ospf->ldp_sync_cmd.flags, LDP_SYNC_FLAG_ENABLE))) + if (if_is_loopback(ifp) || (ifp->vrf->vrf_id != VRF_DEFAULT) + || !(CHECK_FLAG(oi->ospf->ldp_sync_cmd.flags, + LDP_SYNC_FLAG_ENABLE))) return; ols_debug("ldp_sync: init if %s",ifp->name); @@ -856,7 +857,7 @@ DEFPY (mpls_ldp_sync, return CMD_ERR_NOTHING_TODO; } - if (ifp->vrf_id != VRF_DEFAULT) { + if (ifp->vrf->vrf_id != VRF_DEFAULT) { vty_out(vty, "ldp-sync only runs on DEFAULT VRF\n"); return CMD_ERR_NOTHING_TODO; } @@ -897,7 +898,7 @@ DEFPY (no_mpls_ldp_sync, return CMD_ERR_NOTHING_TODO; } - if (ifp->vrf_id != VRF_DEFAULT) { + if (ifp->vrf->vrf_id != VRF_DEFAULT) { vty_out(vty, "ldp-sync only runs on DEFAULT VRF\n"); return CMD_ERR_NOTHING_TODO; } @@ -940,7 +941,7 @@ DEFPY (mpls_ldp_sync_holddown, return CMD_ERR_NOTHING_TODO; } - if (ifp->vrf_id != VRF_DEFAULT) { + if (ifp->vrf->vrf_id != VRF_DEFAULT) { vty_out(vty, "ldp-sync only runs on DEFAULT VRF\n"); return CMD_ERR_NOTHING_TODO; } @@ -978,7 +979,7 @@ DEFPY (no_mpls_ldp_sync_holddown, return CMD_ERR_NOTHING_TODO; } - if (ifp->vrf_id != VRF_DEFAULT) { + if (ifp->vrf->vrf_id != VRF_DEFAULT) { vty_out(vty, "ldp-sync only runs on DEFAULT VRF\n"); return CMD_ERR_NOTHING_TODO; } |