Merge commit 'ebd807c0b8eb0b7a3dc3371cd4c87ae886c00885' into haugesund

5 files changed, 14 insertions, 14 deletions

diff --git a/nest/neighbor.c b/nest/neighbor.c
index 1a31fb79..7cf9c85d 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -345,7 +345,7 @@ neigh_free(neighbor *n)
 {
   rem_node(&n->n);
   rem_node(&n->if_n);
-  sl_free(neigh_slab, n);
+  sl_free(n);
 }
 
 /**
diff --git a/nest/route.h b/nest/route.h
index ab8ee258..1aba218b 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -487,7 +487,7 @@ void rt_refresh_end(rtable *t, struct rt_import_request *);
 void rt_modify_stale(rtable *t, struct rt_import_request *);
 void rt_schedule_prune(rtable *t);
 void rte_dump(struct rte_storage *);
-void rte_free(struct rte_storage *, rtable *);
+void rte_free(struct rte_storage *);
 struct rte_storage *rte_store(const rte *, net *net, rtable *);
 void rt_dump(rtable *);
 void rt_dump_all(void);
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 1bece201..863d411b 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -154,7 +154,7 @@ rt_prune_sources(void)
     {
       HASH_DO_REMOVE(src_hash, RSH, sp);
       idm_free(&src_ids, src->global_id);
-      sl_free(rte_src_slab, src);
+      sl_free(src);
     }
   }
   HASH_WALK_FILTER_END;
@@ -391,7 +391,7 @@ nexthop_free(struct nexthop *o)
   while (o)
     {
       n = o->next;
-      sl_free(nexthop_slab(o), o);
+      sl_free(o);
       o = n;
     }
 }
@@ -1231,7 +1231,7 @@ rta__free(rta *a)
     nexthop_free(a->nh.next);
   ea_free(a->eattrs);
   a->cached = 0;
-  sl_free(rta_slab(a), a);
+  sl_free(a);
 }
 
 rta *
diff --git a/nest/rt-fib.c b/nest/rt-fib.c
index 1690a8f6..43e3039d 100644
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@@ -475,7 +475,7 @@ fib_delete(struct fib *f, void *E)
 	    }
 
 	  if (f->fib_slab)
-	    sl_free(f->fib_slab, E);
+	    sl_free(E);
 	  else
 	    mb_free(E);
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 48a75aca..b1ea1d98 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -617,11 +617,11 @@ rte_store(const rte *r, net *net, rtable *tab)
  */
 
 void
-rte_free(struct rte_storage *e, rtable *tab)
+rte_free(struct rte_storage *e)
 {
   rt_unlock_source(e->rte.src);
   rta_free(e->rte.attrs);
-  sl_free(tab->rte_slab, e);
+  sl_free(e);
 }
 
 static int				/* Actually better or at least as good as */
@@ -852,7 +852,7 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
   p->rt_notify(p, c, net, new, old_exported ? &old_exported->rte : old);
 
   if (c->out_table && old_exported)
-    rte_free(old_exported, c->out_table);
+    rte_free(old_exported);
 }
 
 static void
@@ -1469,7 +1469,7 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
       if (!new_stored)
 	hmap_clear(&table->id_map, old->id);
 
-      rte_free(old_stored, table);
+      rte_free(old_stored);
     }
 }
 
@@ -2856,7 +2856,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
   }
 
   for (int i=0; i<count; i++)
-    rte_free(updates[i].old, tab);
+    rte_free(updates[i].old);
 
   return count;
 }
@@ -3144,7 +3144,7 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
       /* Remove the old rte */
       struct rte_storage *del = *pos;
       *pos = (*pos)->next;
-      rte_free(del, tab);
+      rte_free(del);
       tab->rt_count--;
     }
   else if (new)
@@ -3268,7 +3268,7 @@ again:
       if (all || (e->rte.flags & (REF_STALE | REF_DISCARD)))
       {
 	*ee = e->next;
-	rte_free(e, t);
+	rte_free(e);
 	t->rt_count--;
       }
       else
@@ -3471,7 +3471,7 @@ hc_delete_hostentry(struct hostcache *hc, pool *p, struct hostentry *he)
 
   rem_node(&he->ln);
   hc_remove(hc, he);
-  sl_free(hc->slab, he);
+  sl_free(he);
 
   hc->hash_items--;
   if (hc->hash_items < hc->hash_min)