summaryrefslogtreecommitdiffstats
path: root/nhrpd
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2020-02-03 17:22:13 +0100
committerQuentin Young <qlyoung@cumulusnetworks.com>2020-02-03 17:22:13 +0100
commitb3ba5dc7fe769f3719b2812e4fdb9f8f8271032d (patch)
tree326b49289dd6b1e83c4ff98899983dd4972afff8 /nhrpd
parentMerge pull request #5669 from donaldsharp/nhg_ip (diff)
downloadfrr-b3ba5dc7fe769f3719b2812e4fdb9f8f8271032d.tar.xz
frr-b3ba5dc7fe769f3719b2812e4fdb9f8f8271032d.zip
*: don't null after XFREE; XFREE does this itself
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'nhrpd')
-rw-r--r--nhrpd/nhrp_route.c1
-rw-r--r--nhrpd/nhrp_shortcut.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c
index cfca86a9b..a23ac3474 100644
--- a/nhrpd/nhrp_route.c
+++ b/nhrpd/nhrp_route.c
@@ -58,7 +58,6 @@ static void nhrp_route_update_put(struct route_node *rn)
if (!ri->ifp && !ri->nhrp_ifp
&& sockunion_family(&ri->via) == AF_UNSPEC) {
XFREE(MTYPE_NHRP_ROUTE, rn->info);
- rn->info = NULL;
route_unlock_node(rn);
}
route_unlock_node(rn);
diff --git a/nhrpd/nhrp_shortcut.c b/nhrpd/nhrp_shortcut.c
index 84053b4b5..b3fdecf0e 100644
--- a/nhrpd/nhrp_shortcut.c
+++ b/nhrpd/nhrp_shortcut.c
@@ -141,7 +141,6 @@ static void nhrp_shortcut_delete(struct nhrp_shortcut *s)
rn = route_node_lookup(shortcut_rib[afi], s->p);
if (rn) {
XFREE(MTYPE_NHRP_SHORTCUT, rn->info);
- rn->info = NULL;
route_unlock_node(rn);
route_unlock_node(rn);
}