bgpd: Do not set chunk pointer to NULL after free

`srv6_locator_chunk_free()` takes care of freeing the memory allocated
for a `struct srv6_locator_chunk` and setting the
`struct srv6_locator_chunk` pointer to NULL.

It is not necessary to explicitly set the pointer to NULL after invoking
`srv6_locator_chunk_free()`.

Signed-off-by: Carmine Scarpitta <carmine.scarpitta@uniroma2.it>

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index ad4221d1345fbc509069ca1f779617ab12263787..97c040e2ee837621ff548f2bd53c6a3f13767750 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -892,7 +892,6 @@ void delete_vrf_tovpn_sid_per_af(struct bgp *bgp_vpn, struct bgp *bgp_vrf,
                return;
 
        srv6_locator_chunk_free(&bgp_vrf->vpn_policy[afi].tovpn_sid_locator);
-       bgp_vrf->vpn_policy[afi].tovpn_sid_locator = NULL;
 
        if (bgp_vrf->vpn_policy[afi].tovpn_sid) {
                sid_unregister(bgp_vrf, bgp_vrf->vpn_policy[afi].tovpn_sid);
@@ -920,7 +919,6 @@ void delete_vrf_tovpn_sid_per_vrf(struct bgp *bgp_vpn, struct bgp *bgp_vrf)
                return;
 
        srv6_locator_chunk_free(&bgp_vrf->tovpn_sid_locator);
-       bgp_vrf->tovpn_sid_locator = NULL;
 
        if (bgp_vrf->tovpn_sid) {
                sid_unregister(bgp_vrf, bgp_vrf->tovpn_sid);

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 09f4fada8027ce74b68c6d890b2516efecd1463d..8c3f2bf9b731716420cd0054f7afcf684582ef44 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -347,20 +347,16 @@ static int bgp_srv6_locator_unset(struct bgp *bgp)
                /* refresh vpnv4 tovpn_sid_locator */
                tovpn_sid_locator =
                        bgp_vrf->vpn_policy[AFI_IP].tovpn_sid_locator;
-               if (tovpn_sid_locator) {
+               if (tovpn_sid_locator)
                        srv6_locator_chunk_free(
                                &bgp_vrf->vpn_policy[AFI_IP].tovpn_sid_locator);
-                       bgp_vrf->vpn_policy[AFI_IP].tovpn_sid_locator = NULL;
-               }
 
                /* refresh vpnv6 tovpn_sid_locator */
                tovpn_sid_locator =
                        bgp_vrf->vpn_policy[AFI_IP6].tovpn_sid_locator;
-               if (tovpn_sid_locator) {
+               if (tovpn_sid_locator)
                        srv6_locator_chunk_free(&bgp_vrf->vpn_policy[AFI_IP6]
                                                         .tovpn_sid_locator);
-                       bgp_vrf->vpn_policy[AFI_IP6].tovpn_sid_locator = NULL;
-               }
 
                /* refresh per-vrf tovpn_sid_locator */
                srv6_locator_chunk_free(&bgp_vrf->tovpn_sid_locator);

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index f6c0863241b9faadff6b0a48e4cd1b467aa69f2c..efdc81a14503920631d491ba06810fafbe0594c7 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -3343,13 +3343,10 @@ static int bgp_zebra_process_srv6_locator_delete(ZAPI_CALLBACK_ARGS)
                        tmp_prefi.prefixlen = IPV6_MAX_BITLEN;
                        tmp_prefi.prefix = tovpn_sid_locator->prefix.prefix;
                        if (prefix_match((struct prefix *)&loc.prefix,
-                                        (struct prefix *)&tmp_prefi)) {
+                                        (struct prefix *)&tmp_prefi))
                                srv6_locator_chunk_free(
                                        &bgp_vrf->vpn_policy[AFI_IP]
                                                 .tovpn_sid_locator);
-                               bgp_vrf->vpn_policy[AFI_IP].tovpn_sid_locator =
-                                       NULL;
-                       }
                }
 
                /* refresh vpnv6 tovpn_sid_locator */
@@ -3360,13 +3357,10 @@ static int bgp_zebra_process_srv6_locator_delete(ZAPI_CALLBACK_ARGS)
                        tmp_prefi.prefixlen = IPV6_MAX_BITLEN;
                        tmp_prefi.prefix = tovpn_sid_locator->prefix.prefix;
                        if (prefix_match((struct prefix *)&loc.prefix,
-                                        (struct prefix *)&tmp_prefi)) {
+                                        (struct prefix *)&tmp_prefi))
                                srv6_locator_chunk_free(
                                        &bgp_vrf->vpn_policy[AFI_IP6]
                                                 .tovpn_sid_locator);
-                               bgp_vrf->vpn_policy[AFI_IP6].tovpn_sid_locator =
-                                       NULL;
-                       }
                }
 
                /* refresh per-vrf tovpn_sid_locator */