summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bgpd/bgp_route.c4
-rw-r--r--bgpd/bgp_table.c6
-rw-r--r--bgpd/bgp_table.h3
3 files changed, 0 insertions, 13 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 979e7bda35..e7eb7b6d2f 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -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);
}
diff --git a/bgpd/bgp_table.c b/bgpd/bgp_table.c
index ff0cfdd658..642807e7ab 100644
--- a/bgpd/bgp_table.c
+++ b/bgpd/bgp_table.c
@@ -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);
}
diff --git a/bgpd/bgp_table.h b/bgpd/bgp_table.h
index cff270ebb9..7b22872628 100644
--- a/bgpd/bgp_table.h
+++ b/bgpd/bgp_table.h
@@ -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;
};