From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: Cong Wang <xiyou.wangcong@gmail.com>,
Jamal Hadi Salim <jhs@mojatatu.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH net-next v3 1/6] net_sched: remove get_stats from tc_action_ops
Date: Thu, 12 Dec 2013 21:47:48 -0800 [thread overview]
Message-ID: <1386913673-8210-2-git-send-email-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <1386913673-8210-1-git-send-email-xiyou.wangcong@gmail.com>
It is not used.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
include/net/act_api.h | 1 -
net/sched/act_api.c | 4 ----
2 files changed, 5 deletions(-)
diff --git a/include/net/act_api.h b/include/net/act_api.h
index 9e90fdf..04c6825 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -72,7 +72,6 @@ struct tc_action_ops {
__u32 capab; /* capabilities includes 4 bit version */
struct module *owner;
int (*act)(struct sk_buff *, const struct tc_action *, struct tcf_result *);
- int (*get_stats)(struct sk_buff *, struct tc_action *);
int (*dump)(struct sk_buff *, struct tc_action *, int, int);
int (*cleanup)(struct tc_action *, int bind);
int (*lookup)(struct tc_action *, u32);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 4adbce8..51e28f7 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -637,10 +637,6 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
if (err < 0)
goto errout;
- if (a->ops != NULL && a->ops->get_stats != NULL)
- if (a->ops->get_stats(skb, a) < 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 ||
--
1.8.1.4
next prev parent reply other threads:[~2013-12-13 5:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-13 5:47 [PATCH net-next v3 0/6] net_sched: some cleanup and improvments Cong Wang
2013-12-13 5:47 ` Cong Wang [this message]
2013-12-13 10:21 ` [PATCH net-next v3 1/6] net_sched: remove get_stats from tc_action_ops David Laight
2013-12-13 18:33 ` Cong Wang
2013-12-13 21:27 ` Jamal Hadi Salim
2013-12-13 21:34 ` Cong Wang
2013-12-13 21:40 ` Jamal Hadi Salim
2013-12-13 21:50 ` Cong Wang
2013-12-13 22:19 ` Jamal Hadi Salim
2013-12-13 23:23 ` David Miller
2013-12-14 2:59 ` Jamal Hadi Salim
2013-12-14 5:15 ` David Miller
2013-12-14 12:22 ` Jamal Hadi Salim
2013-12-15 3:26 ` David Miller
2013-12-13 23:21 ` David Miller
2013-12-13 12:05 ` Jamal Hadi Salim
2013-12-13 18:38 ` Cong Wang
2013-12-13 21:29 ` Jamal Hadi Salim
2013-12-13 5:47 ` [PATCH net-next v3 2/6] net_sched: act: use standard struct list_head Cong Wang
2013-12-13 12:08 ` Jamal Hadi Salim
2013-12-13 18:48 ` Cong Wang
2013-12-13 21:29 ` Jamal Hadi Salim
2013-12-13 21:35 ` Cong Wang
2013-12-13 5:47 ` [PATCH net-next v3 3/6] net_sched: mirred: remove action when the target device is gone Cong Wang
2013-12-13 12:07 ` Jamal Hadi Salim
2013-12-13 12:12 ` David Laight
2013-12-13 18:52 ` Cong Wang
2013-12-13 5:47 ` [PATCH net-next v3 4/6] net_sched: cls: refactor out struct tcf_ext_map Cong Wang
2013-12-13 5:47 ` [PATCH net-next v3 5/6] net_sched: init struct tcf_hashinfo at register time Cong Wang
2013-12-13 5:47 ` [PATCH net-next v3 6/6] net_sched: convert tcf_hashinfo to hlist and use rcu Cong Wang
2013-12-13 6:48 ` Eric Dumazet
2013-12-13 21:44 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386913673-8210-2-git-send-email-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=davem@davemloft.net \
--cc=jhs@mojatatu.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).