diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2017-05-17 11:07:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-17 15:22:13 -0400 |
| commit | 87d83093bfc2f4938ff21524ebb50ecf53c15a64 (patch) | |
| tree | 01fb111836ae2d7e38bfd649bd774eee8fdd458c /include | |
| parent | c63fbb0b41ef3c863a8c6da259000084d9e1c458 (diff) | |
| download | linux-stable-87d83093bfc2f4938ff21524ebb50ecf53c15a64.tar.gz linux-stable-87d83093bfc2f4938ff21524ebb50ecf53c15a64.tar.bz2 linux-stable-87d83093bfc2f4938ff21524ebb50ecf53c15a64.zip | |
net: sched: move tc_classify function to cls_api.c
Move tc_classify function to cls_api.c where it belongs, rename it to
fit the namespace.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/pkt_cls.h | 9 | ||||
| -rw-r--r-- | include/net/pkt_sched.h | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 269fd78bb0ae..cb745067feb3 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -19,10 +19,19 @@ int unregister_tcf_proto_ops(struct tcf_proto_ops *ops); #ifdef CONFIG_NET_CLS void tcf_destroy_chain(struct tcf_proto __rcu **fl); +int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, + struct tcf_result *res, bool compat_mode); + #else static inline void tcf_destroy_chain(struct tcf_proto __rcu **fl) { } + +static inline int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, + struct tcf_result *res, bool compat_mode) +{ + return TC_ACT_UNSPEC; +} #endif static inline unsigned long diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index bec46f63f10c..2579c209ea51 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h @@ -113,9 +113,6 @@ static inline void qdisc_run(struct Qdisc *q) __qdisc_run(q); } -int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp, - struct tcf_result *res, bool compat_mode); - static inline __be16 tc_skb_protocol(const struct sk_buff *skb) { /* We need to take extra care in case the skb came via |