diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-04-29 09:21:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-29 09:21:09 -0400 |
| commit | edae83911947a80ed5116d5e3aff2e64c91eb724 (patch) | |
| tree | e94421bb8a30d21ce1758e46841be4e67da90659 /ospfd/ospf_interface.c | |
| parent | 8421f6221ad37e43010b011cddb4b42623983611 (diff) | |
| parent | 1ce626aea6f1f274da92478a8e487c229b08f9ce (diff) | |
Merge pull request #15824 from opensourcerouting/fix/ospf_show_non_default
vtysh: Show `ip ospf network ...` even if it's not the same as the interface type
Diffstat (limited to 'ospfd/ospf_interface.c')
| -rw-r--r-- | ospfd/ospf_interface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 0b27501019..11ac7af7c9 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -1414,7 +1414,8 @@ static int ospf_ifp_create(struct interface *ifp) (!OSPF_IF_PARAM_CONFIGURED(IF_DEF_PARAMS(ifp), type) || if_is_loopback(ifp))) { SET_IF_PARAM(IF_DEF_PARAMS(ifp), type); - IF_DEF_PARAMS(ifp)->type = ospf_default_iftype(ifp); + if (!IF_DEF_PARAMS(ifp)->type_cfg) + IF_DEF_PARAMS(ifp)->type = ospf_default_iftype(ifp); } ospf = ifp->vrf->info; |