Merge pull request #3863 from patrasar/RP_addition_deletion_changes

[mirror_frr.git] / pimd / pim_cmd.c

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 2d4c237d0fc7f01fc43663539f3f002e4852d73b..f058b7adbfb26ffbe7c62fcbe94b7b188fb24fc9 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1191,7 +1191,7 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
                        vty_out(vty, "Designated Router\n");
                        vty_out(vty, "-----------------\n");
                        vty_out(vty, "Address   : %s\n", dr_str);
-                       vty_out(vty, "Priority  : %d(%d)\n",
+                       vty_out(vty, "Priority  : %u(%d)\n",
                                pim_ifp->pim_dr_priority,
                                pim_ifp->pim_dr_num_nondrpri_neighbors);
                        vty_out(vty, "Uptime    : %s\n", dr_uptime);
@@ -2794,9 +2794,9 @@ struct pnc_cache_walk_data {
        struct pim_instance *pim;
 };
 
-static int pim_print_pnc_cache_walkcb(struct hash_backet *backet, void *arg)
+static int pim_print_pnc_cache_walkcb(struct hash_bucket *bucket, void *arg)
 {
-       struct pim_nexthop_cache *pnc = backet->data;
+       struct pim_nexthop_cache *pnc = bucket->data;
        struct pnc_cache_walk_data *cwd = arg;
        struct vty *vty = cwd->vty;
        struct pim_instance *pim = cwd->pim;
@@ -5164,16 +5164,14 @@ static int pim_cmd_spt_switchover(struct pim_instance *pim,
 
        switch (pim->spt.switchover) {
        case PIM_SPT_IMMEDIATE:
-               if (pim->spt.plist)
-                       XFREE(MTYPE_PIM_SPT_PLIST_NAME, pim->spt.plist);
+               XFREE(MTYPE_PIM_SPT_PLIST_NAME, pim->spt.plist);
 
                pim_upstream_add_lhr_star_pimreg(pim);
                break;
        case PIM_SPT_INFINITY:
                pim_upstream_remove_lhr_star_pimreg(pim, plist);
 
-               if (pim->spt.plist)
-                       XFREE(MTYPE_PIM_SPT_PLIST_NAME, pim->spt.plist);
+               XFREE(MTYPE_PIM_SPT_PLIST_NAME, pim->spt.plist);
 
                if (plist)
                        pim->spt.plist =
@@ -6358,8 +6356,8 @@ DEFUN (interface_ip_pim_drprio,
        pim_ifp->pim_dr_priority = strtol(argv[idx_number]->arg, NULL, 10);
 
        if (old_dr_prio != pim_ifp->pim_dr_priority) {
-               if (pim_if_dr_election(ifp))
-                       pim_hello_restart_now(ifp);
+               pim_if_dr_election(ifp);
+               pim_hello_restart_now(ifp);
        }
 
        return CMD_SUCCESS;
@@ -6384,8 +6382,8 @@ DEFUN (interface_no_ip_pim_drprio,
 
        if (pim_ifp->pim_dr_priority != PIM_DEFAULT_DR_PRIORITY) {
                pim_ifp->pim_dr_priority = PIM_DEFAULT_DR_PRIORITY;
-               if (pim_if_dr_election(ifp))
-                       pim_hello_restart_now(ifp);
+               pim_if_dr_election(ifp);
+               pim_hello_restart_now(ifp);
        }
 
        return CMD_SUCCESS;