Merge commit 'f2f3163f6c3fba7f9ef03640d7b2f6323873d2cc' into haugesund

2 files changed, 2 insertions, 11 deletions

diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index 7bcf28ba..6a186999 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -525,7 +525,7 @@ mrt_rib_table_dump(struct mrt_table_dump_state *s, net *n, int add_path)
     }
 
     rte e = rt->rte;
-    if (f_run(s->filter, &e, s->linpool, 0) <= F_ACCEPT)
+    if (f_run(s->filter, &e, 0) <= F_ACCEPT)
       mrt_rib_table_entry(s, &e);
 
     lp_flush(s->linpool);
diff --git a/proto/static/static.c b/proto/static/static.c
index fe0c77bc..87d795ee 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -47,8 +47,6 @@
 
 #include "static.h"
 
-static linpool *static_lp;
-
 static inline struct rte_src * static_get_source(struct static_proto *p, uint i)
 { return i ? rt_get_source(&p->p, i) : p->p.main_source; }
 
@@ -107,14 +105,10 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
 
   /* Evaluate the filter */
   if (r->cmds)
-    f_eval_rte(r->cmds, e, static_lp);
+    f_eval_rte(r->cmds, e);
 
   rte_update(p->p.main_channel, r->net, e, src);
   r->state = SRS_CLEAN;
-
-  if (r->cmds)
-    lp_flush(static_lp);
-
   return;
 
 withdraw:
@@ -474,9 +468,6 @@ static_start(struct proto *P)
   struct static_config *cf = (void *) P->cf;
   struct static_route *r;
 
-  if (!static_lp)
-    static_lp = lp_new(&root_pool);
-
   if (p->igp_table_ip4)
     rt_lock_table(p->igp_table_ip4);