bgpd: Remove unset table.owner

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 31c1dd8c101d0fa82574bc2061d94eeac7e9e465..d35e9a03cc252195b6ed1cdb5dc6c629c50b6029 100644 (file)
--- 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 ff0cfdd6589b86e8e031fd2a56597e49043e4603..642807e7ab43a76d829823329bb9b800857a0be6 100644 (file)
--- 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 cff270ebb95ed74997e4412679818bf3f3e68f54..7b228726286d38624ec1d5f219ec88aebe37e0d6 100644 (file)
--- 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;
 };