net_sched: act: remove struct tcf_act_hdr

It is not necessary at all.

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

diff --git a/include/net/act_api.h b/include/net/act_api.h
index 268f9e6babd72dc68b4aa7ef0f0dd04adadac333..e171387512b3cb56277e9cdb21e9e21fb1342ecb 100644 (file)
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -73,10 +73,6 @@ static inline void tcf_hashinfo_destroy(struct tcf_hashinfo *hf)
 #define ACT_P_CREATED 1
 #define ACT_P_DELETED 1
 
-struct tcf_act_hdr {
-       struct tcf_common       common;
-};
-
 struct tc_action {
        void                    *priv;
        const struct tc_action_ops      *ops;

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 178bf2eab11767e68c5f086ba31ae80c67f3bfe8..35f89e9ce49c2f9300c38a03ca0348e726331d29 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -556,9 +556,9 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
 {
        int err = 0;
        struct gnet_dump d;
-       struct tcf_act_hdr *h = a->priv;
+       struct tcf_common *p = a->priv;
 
-       if (h == NULL)
+       if (p == NULL)
                goto errout;
 
        /* compat_mode being true specifies a call that is supposed
@@ -567,20 +567,20 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
        if (compat_mode) {
                if (a->type == TCA_OLD_COMPAT)
                        err = gnet_stats_start_copy_compat(skb, 0,
-                               TCA_STATS, TCA_XSTATS, &h->tcf_lock, &d);
+                               TCA_STATS, TCA_XSTATS, &p->tcfc_lock, &d);
                else
                        return 0;
        } else
                err = gnet_stats_start_copy(skb, TCA_ACT_STATS,
-                                           &h->tcf_lock, &d);
+                                           &p->tcfc_lock, &d);
 
        if (err < 0)
                goto errout;
 
-       if (gnet_stats_copy_basic(&d, &h->tcf_bstats) < 0 ||
-           gnet_stats_copy_rate_est(&d, &h->tcf_bstats,
-                                    &h->tcf_rate_est) < 0 ||
-           gnet_stats_copy_queue(&d, &h->tcf_qstats) < 0)
+       if (gnet_stats_copy_basic(&d, &p->tcfc_bstats) < 0 ||
+           gnet_stats_copy_rate_est(&d, &p->tcfc_bstats,
+                                    &p->tcfc_rate_est) < 0 ||
+           gnet_stats_copy_queue(&d, &p->tcfc_qstats) < 0)
                goto errout;
 
        if (gnet_stats_finish_copy(&d) < 0)