mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-04 02:46:34 +00:00
Merge pull request #728 from donaldsharp/owner
bgpd: Remove unset table.owner
This commit is contained in:
commit
7ee5d889e1
@ -3532,10 +3532,6 @@ bgp_cleanup_table(struct bgp_table *table, safi_t safi)
|
||||
&& (ri->sub_type == BGP_ROUTE_NORMAL ||
|
||||
ri->sub_type == BGP_ROUTE_AGGREGATE))
|
||||
{
|
||||
#if ENABLE_BGP_VNC
|
||||
if (table->owner && table->owner->bgp)
|
||||
vnc_import_bgp_del_route(table->owner->bgp, &rn->p, ri);
|
||||
#endif
|
||||
bgp_zebra_withdraw (&rn->p, ri, safi);
|
||||
bgp_info_reap (rn, ri);
|
||||
}
|
||||
|
@ -50,12 +50,6 @@ bgp_table_unlock (struct bgp_table *rt)
|
||||
route_table_finish (rt->route_table);
|
||||
rt->route_table = NULL;
|
||||
|
||||
if (rt->owner)
|
||||
{
|
||||
peer_unlock (rt->owner);
|
||||
rt->owner = NULL;
|
||||
}
|
||||
|
||||
XFREE (MTYPE_BGP_TABLE, rt);
|
||||
}
|
||||
|
||||
|
@ -31,9 +31,6 @@ struct bgp_table
|
||||
|
||||
int lock;
|
||||
|
||||
/* The owner of this 'bgp_table' structure. */
|
||||
struct peer *owner;
|
||||
|
||||
struct route_table *route_table;
|
||||
uint64_t version;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user