diff options
| -rw-r--r-- | bgpd/bgp_evpn_vty.c | 4 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 2 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 12 |
3 files changed, 12 insertions, 6 deletions
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index f6b87dccdb..c16ac5636b 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -6031,6 +6031,7 @@ DEFUN(no_bgp_evpn_ead_es_rt, no_bgp_evpn_ead_es_rt_cmd, if (!bgp_evpn_rt_matches_existing(bgp_mh_info->ead_es_export_rtl, ecomdel)) { + ecommunity_free(&ecomdel); vty_out(vty, "%% RT specified does not match EAD-ES RT configuration\n"); return CMD_WARNING; @@ -6165,6 +6166,7 @@ DEFUN (no_bgp_evpn_vni_rt, if (rt_type == RT_TYPE_IMPORT) { if (!bgp_evpn_rt_matches_existing(vpn->import_rtl, ecomdel)) { + ecommunity_free(&ecomdel); vty_out(vty, "%% RT specified does not match configuration for this VNI\n"); return CMD_WARNING; @@ -6172,6 +6174,7 @@ DEFUN (no_bgp_evpn_vni_rt, evpn_unconfigure_import_rt(bgp, vpn, ecomdel); } else if (rt_type == RT_TYPE_EXPORT) { if (!bgp_evpn_rt_matches_existing(vpn->export_rtl, ecomdel)) { + ecommunity_free(&ecomdel); vty_out(vty, "%% RT specified does not match configuration for this VNI\n"); return CMD_WARNING; @@ -6191,6 +6194,7 @@ DEFUN (no_bgp_evpn_vni_rt, } if (!found_ecomdel) { + ecommunity_free(&ecomdel); vty_out(vty, "%% RT specified does not match configuration for this VNI\n"); return CMD_WARNING; diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 162a7ed881..eb00287890 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -6014,6 +6014,7 @@ void bgp_static_update(struct bgp *bgp, const struct prefix *p, /* Unintern original. */ aspath_unintern(&attr.aspath); bgp_static_withdraw(bgp, p, afi, safi); + bgp_dest_unlock_node(dest); return; } @@ -6340,6 +6341,7 @@ static void bgp_static_update_safi(struct bgp *bgp, const struct prefix *p, aspath_unintern(&attr.aspath); bgp_static_withdraw_safi(bgp, p, afi, safi, &bgp_static->prd); + bgp_dest_unlock_node(dest); return; } diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index b15b72a262..71ad7bf69e 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -188,12 +188,12 @@ enum { RTM_SETHWFLAGS = 119, #define RTM_SETHWFLAGS RTM_SETHWFLAGS - RTM_NEWTUNNEL = 120, -#define RTM_NEWTUNNEL RTM_NEWTUNNEL - RTM_DELTUNNEL, -#define RTM_DELTUNNEL RTM_DELTUNNEL - RTM_GETTUNNEL, -#define RTM_GETTUNNEL RTM_GETTUNNEL + RTM_NEWTUNNEL = 120, +#define RTM_NEWTUNNEL RTM_NEWTUNNEL + RTM_DELTUNNEL, +#define RTM_DELTUNNEL RTM_DELTUNNEL + RTM_GETTUNNEL, +#define RTM_GETTUNNEL RTM_GETTUNNEL __RTM_MAX, #define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) |