From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 12 Nov 2016 02:21:49 +0000 (-0500)
Subject: pimd: Removing impossible code
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~98
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=27bc3ae3d4bca97ebaeda698cca25e3b4d8959b3;p=mirror%2Ffrr.git

pimd: Removing impossible code

We've already allocated the mp data structure
and am using hash_alloc_intern for the hash_get
function.  This will return the passed
in data structure.  There is no possibility
of mp being NULL.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 8e933222c6..43e2e888f5 100644
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -995,11 +995,6 @@ pim_msdp_peer_new(struct in_addr peer_addr, struct in_addr local_addr,
 
   /* insert into misc tables for easy access */
   mp = hash_get(msdp->peer_hash, mp, hash_alloc_intern);
-  if (!mp) {
-    zlog_err("%s: PIM hash get failure", __PRETTY_FUNCTION__);
-    pim_msdp_peer_free(mp);
-    return PIM_MSDP_ERR_OOM;
-  }
   listnode_add_sort(msdp->peer_list, mp);
 
   if (PIM_DEBUG_MSDP_EVENTS) {