diff options
| author | Rafael Zalamena <rzalamena@users.noreply.github.com> | 2019-06-25 16:06:57 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 16:06:57 -0300 |
| commit | 9b2d87406ad63ece549fb45609a5bf5a949f2b38 (patch) | |
| tree | 2993ace953052305f80c03418686d9ac82d96bfc /pimd/pim_cmd.c | |
| parent | 4b7269c42f7a1485cfe8d8e76a3df5d8482cd2ae (diff) | |
| parent | 9e132a491a82c5d4d23e080ffb4c124ac3c6f6dc (diff) | |
Merge pull request #4525 from donaldsharp/some_cleanups
Some cleanups
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 4b9f5fd40a..72d7916b20 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -6653,13 +6653,7 @@ static int pim_cmd_igmp_start(struct vty *vty, struct interface *ifp) pim_ifp = ifp->info; if (!pim_ifp) { - pim_ifp = pim_if_new(ifp, true, false, false, - false /*vxlan_term*/); - if (!pim_ifp) { - vty_out(vty, "Could not enable IGMP on interface %s\n", - ifp->name); - return CMD_WARNING_CONFIG_FAILED; - } + (void)pim_if_new(ifp, true, false, false, false); need_startup = 1; } else { if (!PIM_IF_TEST_IGMP(pim_ifp->options)) { @@ -7390,15 +7384,10 @@ static int pim_cmd_interface_add(struct interface *ifp) { struct pim_interface *pim_ifp = ifp->info; - if (!pim_ifp) { - pim_ifp = pim_if_new(ifp, false, true, false, - false /*vxlan_term*/); - if (!pim_ifp) { - return 0; - } - } else { + if (!pim_ifp) + (void)pim_if_new(ifp, false, true, false, false); + else PIM_IF_DO_PIM(pim_ifp->options); - } pim_if_addr_add_all(ifp); pim_if_membership_refresh(ifp); |