net_sched: remove the first parameter from tcf_exts_destroy()

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <hadi@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 6da46dcf1049789f492cefd9472d0df84d4db91d..73f9532ee581cdd219cb6a95fb8a8d20ee5b00b6 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -137,7 +137,7 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts,
 int tcf_exts_validate(struct net *net, struct tcf_proto *tp,
                      struct nlattr **tb, struct nlattr *rate_tlv,
                      struct tcf_exts *exts, bool ovr);
-void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts);
+void tcf_exts_destroy(struct tcf_exts *exts);
 void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
                     struct tcf_exts *src);
 int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts);

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index e547efdaba9dc19d5caa1ec7e8e27c36176762c4..77147c8c4acc01ea3a0f7c19b30720ee7ad987d3 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -496,7 +496,7 @@ out:
        return skb->len;
 }
 
-void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)
+void tcf_exts_destroy(struct tcf_exts *exts)
 {
 #ifdef CONFIG_NET_CLS_ACT
        tcf_action_destroy(&exts->actions, TCA_ACT_UNBIND);

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 1937298d677557176dbee8a96ecdbfba632c1df0..fe20826a79e743a9a18de5d3568d0ea3d27d8f71 100644 (file)
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -94,7 +94,7 @@ static void basic_delete_filter(struct rcu_head *head)
        struct tcf_proto *tp = f->tp;
 
        tcf_unbind_filter(tp, &f->res);
-       tcf_exts_destroy(tp, &f->exts);
+       tcf_exts_destroy(&f->exts);
        tcf_em_tree_destroy(tp, &f->ematches);
        kfree(f);
 }
@@ -161,7 +161,7 @@ static int basic_set_parms(struct net *net, struct tcf_proto *tp,
 
        return 0;
 errout:
-       tcf_exts_destroy(tp, &e);
+       tcf_exts_destroy(&e);
        return err;
 }
 

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index 4e3f5bfc0b26d7ed6ea1699bac3ecef78a578e23..4318d067b0a0c99872e23e51dbce488d31e60ea2 100644 (file)
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -93,7 +93,7 @@ static int cls_bpf_init(struct tcf_proto *tp)
 static void cls_bpf_delete_prog(struct tcf_proto *tp, struct cls_bpf_prog *prog)
 {
        tcf_unbind_filter(tp, &prog->res);
-       tcf_exts_destroy(tp, &prog->exts);
+       tcf_exts_destroy(&prog->exts);
 
        bpf_prog_destroy(prog->filter);
 
@@ -217,7 +217,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
 errout_free:
        kfree(bpf_ops);
 errout:
-       tcf_exts_destroy(tp, &exts);
+       tcf_exts_destroy(&exts);
        return ret;
 }
 

diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 15c34d4ccd9ee904dc681485871c73ed41735332..3409f168225f93e37b5303068809aaba1980ce2c 100644 (file)
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -86,7 +86,7 @@ static void cls_cgroup_destroy_rcu(struct rcu_head *root)
                                                    struct cls_cgroup_head,
                                                    rcu);
 
-       tcf_exts_destroy(head->tp, &head->exts);
+       tcf_exts_destroy(&head->exts);
        tcf_em_tree_destroy(head->tp, &head->ematches);
        kfree(head);
 }
@@ -135,7 +135,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
 
        err = tcf_em_tree_validate(tp, tb[TCA_CGROUP_EMATCHES], &t);
        if (err < 0) {
-               tcf_exts_destroy(tp, &e);
+               tcf_exts_destroy(&e);
                goto errout;
        }
 
@@ -156,7 +156,7 @@ static void cls_cgroup_destroy(struct tcf_proto *tp)
        struct cls_cgroup_head *head = rtnl_dereference(tp->root);
 
        if (head) {
-               tcf_exts_destroy(tp, &head->exts);
+               tcf_exts_destroy(&head->exts);
                tcf_em_tree_destroy(tp, &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 95736fa479f3c17c63d66f9a8251e1a911bdb125..f18d27f7b5f2c0200d6c42150fa509798fd68143 100644 (file)
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -354,7 +354,7 @@ static void flow_destroy_filter(struct rcu_head *head)
        struct flow_filter *f = container_of(head, struct flow_filter, rcu);
 
        del_timer_sync(&f->perturb_timer);
-       tcf_exts_destroy(f->tp, &f->exts);
+       tcf_exts_destroy(&f->exts);
        tcf_em_tree_destroy(f->tp, &f->ematches);
        kfree(f);
 }
@@ -533,7 +533,7 @@ err2:
        tcf_em_tree_destroy(tp, &t);
        kfree(fnew);
 err1:
-       tcf_exts_destroy(tp, &e);
+       tcf_exts_destroy(&e);
        return err;
 }
 

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 2650285620ee8d583dadeb8911332ab245f5bed1..da805aeeb65c7dafa272ad4e138548fdeb66569d 100644 (file)
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -126,7 +126,7 @@ static void fw_delete_filter(struct rcu_head *head)
        struct tcf_proto *tp = f->tp;
 
        tcf_unbind_filter(tp, &f->res);
-       tcf_exts_destroy(tp, &f->exts);
+       tcf_exts_destroy(&f->exts);
        kfree(f);
 }
 
@@ -223,7 +223,7 @@ fw_change_attrs(struct net *net, struct tcf_proto *tp, struct fw_filter *f,
 
        return 0;
 errout:
-       tcf_exts_destroy(tp, &e);
+       tcf_exts_destroy(&e);
        return err;
 }
 

diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index ba96deacf27c8935eb9ae82ee70af30e16315102..b665aee661f7a5e93d752c9adb0d9cc0b23a7ad9 100644 (file)
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -272,7 +272,7 @@ route4_delete_filter(struct rcu_head *head)
        struct tcf_proto *tp = f->tp;
 
        tcf_unbind_filter(tp, &f->res);
-       tcf_exts_destroy(tp, &f->exts);
+       tcf_exts_destroy(&f->exts);
        kfree(f);
 }
 
@@ -456,7 +456,7 @@ static int route4_set_parms(struct net *net, struct tcf_proto *tp,
 
        return 0;
 errout:
-       tcf_exts_destroy(tp, &e);
+       tcf_exts_destroy(&e);
        return err;
 }
 

diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index b044c208b1330994f8f6fef158c4ae5a52b08c15..1c64a09753c448969b3c1cbec418f03a909b8e95 100644 (file)
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -264,7 +264,7 @@ static void
 rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f)
 {
        tcf_unbind_filter(tp, &f->res);
-       tcf_exts_destroy(tp, &f->exts);
+       tcf_exts_destroy(&f->exts);
        kfree_rcu(f, rcu);
 }
 
@@ -577,7 +577,7 @@ insert:
 errout:
        kfree(f);
 errout2:
-       tcf_exts_destroy(tp, &e);
+       tcf_exts_destroy(&e);
        return err;
 }
 

diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 5054fae33a48a3710613cee05101e83cbf5c6c87..e3c6fa3ea3d284e94669a3741e46adceb8f4bff3 100644 (file)
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -169,7 +169,7 @@ found:
                rcu_assign_pointer(*walk, rtnl_dereference(f->next));
        }
        tcf_unbind_filter(tp, &r->res);
-       tcf_exts_destroy(tp, &r->exts);
+       tcf_exts_destroy(&r->exts);
        if (f)
                kfree_rcu(f, rcu);
        return 0;
@@ -401,7 +401,7 @@ errout_alloc:
                kfree(cp->h);
 errout:
        kfree(cp);
-       tcf_exts_destroy(tp, &e);
+       tcf_exts_destroy(&e);
        return err;
 }
 

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index ef97a646ee9411a13ad48ed849cc47ecb4b8a4cd..4be3ebf46d67956bc43fbf10f3cb029b3f62aa84 100644 (file)
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -359,7 +359,7 @@ static int u32_destroy_key(struct tcf_proto *tp,
                           bool free_pf)
 {
        tcf_unbind_filter(tp, &n->res);
-       tcf_exts_destroy(tp, &n->exts);
+       tcf_exts_destroy(&n->exts);
        if (n->ht_down)
                n->ht_down->refcnt--;
 #ifdef CONFIG_CLS_U32_PERF
@@ -606,7 +606,7 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
 
        return 0;
 errout:
-       tcf_exts_destroy(tp, &e);
+       tcf_exts_destroy(&e);
        return err;
 }