proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 05:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6897 from chiragshah6/evpn_7_4

Browse Source 
zebra: Revert "zebra: probe local inactive neigh"
This commit is contained in:
Sri Mohana Singamsetty 2020-09-15 23:06:07 -07:00 committed by GitHub
commit fc6a59c328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
zebra/zebra_vxlan.c
View File

@ -112,7 +112,6 @@ static int zvni_neigh_send_del_to_client(vni_t vni, struct ipaddr *ip,
uint8_t flags, int state); uint8_t flags, int state);
static int zvni_neigh_install(zebra_vni_t *zvni, zebra_neigh_t *n); static int zvni_neigh_install(zebra_vni_t *zvni, zebra_neigh_t *n);
static int zvni_neigh_uninstall(zebra_vni_t *zvni, zebra_neigh_t *n); static int zvni_neigh_uninstall(zebra_vni_t *zvni, zebra_neigh_t *n);
static int zvni_neigh_probe(zebra_vni_t *zvni, zebra_neigh_t *n);
static zebra_vni_t *zvni_from_svi(struct interface *ifp, static zebra_vni_t *zvni_from_svi(struct interface *ifp,
struct interface *br_if); struct interface *br_if);
static struct interface *zvni_map_to_svi(vlanid_t vid, struct interface *br_if); static struct interface *zvni_map_to_svi(vlanid_t vid, struct interface *br_if);
@ -2449,18 +2448,6 @@ static void zvni_process_neigh_on_remote_mac_del(zebra_vni_t *zvni,
/* NOTE: Currently a NO-OP. */ /* NOTE: Currently a NO-OP. */
} }
static void zvni_probe_neigh_on_mac_add(zebra_vni_t *zvni, zebra_mac_t *zmac)
{
zebra_neigh_t *nbr = NULL;
struct listnode *node = NULL;
for (ALL_LIST_ELEMENTS_RO(zmac->neigh_list, node, nbr)) {
if (CHECK_FLAG(nbr->flags, ZEBRA_NEIGH_LOCAL) &&
IS_ZEBRA_NEIGH_INACTIVE(nbr))
zvni_neigh_probe(zvni, nbr);
}
}
/* /*
* Inform BGP about local neighbor addition. * Inform BGP about local neighbor addition.
*/ */
@ -2562,29 +2549,6 @@ static int zvni_neigh_uninstall(zebra_vni_t *zvni, zebra_neigh_t *n)
return 0; return 0;
} }
/*
* Probe neighbor from the kernel.
*/
static int zvni_neigh_probe(zebra_vni_t *zvni, zebra_neigh_t *n)
{
struct zebra_if *zif;
struct zebra_l2info_vxlan *vxl;
struct interface *vlan_if;
zif = zvni->vxlan_if->info;
if (!zif)
return -1;
vxl = &zif->l2info.vxl;
vlan_if = zvni_map_to_svi(vxl->access_vlan, zif->brslave_info.br_if);
if (!vlan_if)
return -1;
dplane_neigh_update(vlan_if, &n->ip, &n->emac);
return 0;
}
/* /*
* Install neighbor hash entry - called upon access VLAN change. * Install neighbor hash entry - called upon access VLAN change.
*/ */
@ -5788,8 +5752,6 @@ static void process_remote_macip_add(vni_t vni,
zvni_neigh_install(zvni, n); zvni_neigh_install(zvni, n);
} }
zvni_probe_neigh_on_mac_add(zvni, mac);
/* Update seq number. */ /* Update seq number. */
n->rem_seq = seq; n->rem_seq = seq;
} }