9 files changed, 21 insertions, 20 deletions

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index fe20826a79e7..90647a8af8ca 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -95,7 +95,7 @@ static void basic_delete_filter(struct rcu_head *head)
 
         tcf_unbind_filter(tp, &f->res);
         tcf_exts_destroy(&f->exts);
-        tcf_em_tree_destroy(tp, &f->ematches);
+        tcf_em_tree_destroy(&f->ematches);
         kfree(f);
 }
 
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 3409f168225f..2f77a89655dc 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -87,7 +87,7 @@ static void cls_cgroup_destroy_rcu(struct rcu_head *root)
                                                     rcu);
 
         tcf_exts_destroy(&head->exts);
-        tcf_em_tree_destroy(head->tp, &head->ematches);
+        tcf_em_tree_destroy(&head->ematches);
         kfree(head);
 }
 
@@ -157,7 +157,7 @@ static void cls_cgroup_destroy(struct tcf_proto *tp)
 
         if (head) {
                 tcf_exts_destroy(&head->exts);
-                tcf_em_tree_destroy(tp, &head->ematches);
+                tcf_em_tree_destroy(&head->ematches);
                 RCU_INIT_POINTER(tp->root, NULL);
                 kfree_rcu(head, rcu);
         }
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index f18d27f7b5f2..a5d2b20db560 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -355,7 +355,7 @@ static void flow_destroy_filter(struct rcu_head *head)
 
         del_timer_sync(&f->perturb_timer);
         tcf_exts_destroy(&f->exts);
-        tcf_em_tree_destroy(f->tp, &f->ematches);
+        tcf_em_tree_destroy(&f->ematches);
         kfree(f);
 }
 
@@ -530,7 +530,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
         return 0;
 
 err2:
-        tcf_em_tree_destroy(tp, &t);
+        tcf_em_tree_destroy(&t);
         kfree(fnew);
 err1:
         tcf_exts_destroy(&e);
diff --git a/net/sched/em_canid.c b/net/sched/em_canid.c
index 7c292d474f47..ddd883ca55b2 100644
--- a/net/sched/em_canid.c
+++ b/net/sched/em_canid.c
@@ -120,7 +120,7 @@ static int em_canid_match(struct sk_buff *skb, struct tcf_ematch *m,
         return match;
 }
 
-static int em_canid_change(struct tcf_proto *tp, void *data, int len,
+static int em_canid_change(struct net *net, void *data, int len,
                           struct tcf_ematch *m)
 {
         struct can_filter *conf = data; /* Array with rules */
@@ -183,7 +183,7 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len,
         return 0;
 }
 
-static void em_canid_destroy(struct tcf_proto *tp, struct tcf_ematch *m)
+static void em_canid_destroy(struct tcf_ematch *m)
 {
         struct canid_match *cm = em_canid_priv(m);
 
diff --git a/net/sched/em_ipset.c b/net/sched/em_ipset.c
index 527aeb7a3ff0..5b4a4efe468c 100644
--- a/net/sched/em_ipset.c
+++ b/net/sched/em_ipset.c
@@ -19,12 +19,11 @@
 #include <net/ip.h>
 #include <net/pkt_cls.h>
 
-static int em_ipset_change(struct tcf_proto *tp, void *data, int data_len,
+static int em_ipset_change(struct net *net, void *data, int data_len,
                            struct tcf_ematch *em)
 {
         struct xt_set_info *set = data;
         ip_set_id_t index;
-        struct net *net = dev_net(qdisc_dev(tp->q));
 
         if (data_len != sizeof(*set))
                 return -EINVAL;
@@ -42,11 +41,11 @@ static int em_ipset_change(struct tcf_proto *tp, void *data, int data_len,
         return -ENOMEM;
 }
 
-static void em_ipset_destroy(struct tcf_proto *p, struct tcf_ematch *em)
+static void em_ipset_destroy(struct tcf_ematch *em)
 {
         const struct xt_set_info *set = (const void *) em->data;
         if (set) {
-                ip_set_nfnl_put(dev_net(qdisc_dev(p->q)), set->index);
+                ip_set_nfnl_put(em->net, set->index);
                 kfree((void *) em->data);
         }
 }
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 9b8c0b0e60d7..c8f8c399b99a 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -856,7 +856,7 @@ static const struct nla_policy meta_policy[TCA_EM_META_MAX + 1] = {
         [TCA_EM_META_HDR]       = { .len = sizeof(struct tcf_meta_hdr) },
 };
 
-static int em_meta_change(struct tcf_proto *tp, void *data, int len,
+static int em_meta_change(struct net *net, void *data, int len,
                           struct tcf_ematch *m)
 {
         int err;
@@ -908,7 +908,7 @@ errout:
         return err;
 }
 
-static void em_meta_destroy(struct tcf_proto *tp, struct tcf_ematch *m)
+static void em_meta_destroy(struct tcf_ematch *m)
 {
         if (m)
                 meta_delete((struct meta_match *) m->data);
diff --git a/net/sched/em_nbyte.c b/net/sched/em_nbyte.c
index a3bed07a008b..df3110d69585 100644
--- a/net/sched/em_nbyte.c
+++ b/net/sched/em_nbyte.c
@@ -23,7 +23,7 @@ struct nbyte_data {
         char                    pattern[0];
 };
 
-static int em_nbyte_change(struct tcf_proto *tp, void *data, int data_len,
+static int em_nbyte_change(struct net *net, void *data, int data_len,
                            struct tcf_ematch *em)
 {
         struct tcf_em_nbyte *nbyte = data;
diff --git a/net/sched/em_text.c b/net/sched/em_text.c
index 15d353d2e4be..f03c3de16c27 100644
--- a/net/sched/em_text.c
+++ b/net/sched/em_text.c
@@ -45,7 +45,7 @@ static int em_text_match(struct sk_buff *skb, struct tcf_ematch *m,
         return skb_find_text(skb, from, to, tm->config, &state) != UINT_MAX;
 }
 
-static int em_text_change(struct tcf_proto *tp, void *data, int len,
+static int em_text_change(struct net *net, void *data, int len,
                           struct tcf_ematch *m)
 {
         struct text_match *tm;
@@ -100,7 +100,7 @@ retry:
         return 0;
 }
 
-static void em_text_destroy(struct tcf_proto *tp, struct tcf_ematch *m)
+static void em_text_destroy(struct tcf_ematch *m)
 {
         if (EM_TEXT_PRIV(m) && EM_TEXT_PRIV(m)->config)
                 textsearch_destroy(EM_TEXT_PRIV(m)->config);
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index ad57f4444b9c..8250c36543d8 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -178,6 +178,7 @@ static int tcf_em_validate(struct tcf_proto *tp,
         struct tcf_ematch_hdr *em_hdr = nla_data(nla);
         int data_len = nla_len(nla) - sizeof(*em_hdr);
         void *data = (void *) em_hdr + sizeof(*em_hdr);
+        struct net *net = dev_net(qdisc_dev(tp->q));
 
         if (!TCF_EM_REL_VALID(em_hdr->flags))
                 goto errout;
@@ -240,7 +241,7 @@ static int tcf_em_validate(struct tcf_proto *tp,
                         goto errout;
 
                 if (em->ops->change) {
-                        err = em->ops->change(tp, data, data_len, em);
+                        err = em->ops->change(net, data, data_len, em);
                         if (err < 0)
                                 goto errout;
                 } else if (data_len > 0) {
@@ -271,6 +272,7 @@ static int tcf_em_validate(struct tcf_proto *tp,
         em->matchid = em_hdr->matchid;
         em->flags = em_hdr->flags;
         em->datalen = data_len;
+        em->net = net;
 
         err = 0;
 errout:
@@ -378,7 +380,7 @@ errout:
         return err;
 
 errout_abort:
-        tcf_em_tree_destroy(tp, tree);
+        tcf_em_tree_destroy(tree);
         return err;
 }
 EXPORT_SYMBOL(tcf_em_tree_validate);
@@ -393,7 +395,7 @@ EXPORT_SYMBOL(tcf_em_tree_validate);
  * tcf_em_tree_validate()/tcf_em_tree_change(). You must ensure that
  * the ematch tree is not in use before calling this function.
  */
-void tcf_em_tree_destroy(struct tcf_proto *tp, struct tcf_ematch_tree *tree)
+void tcf_em_tree_destroy(struct tcf_ematch_tree *tree)
 {
         int i;
 
@@ -405,7 +407,7 @@ void tcf_em_tree_destroy(struct tcf_proto *tp, struct tcf_ematch_tree *tree)
 
                 if (em->ops) {
                         if (em->ops->destroy)
-                                em->ops->destroy(tp, em);
+                                em->ops->destroy(em);
                         else if (!tcf_em_is_simple(em))
                                 kfree((void *) em->data);
                         module_put(em->ops->owner);