diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-09-13 18:41:29 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-09-13 18:41:29 -0700 |
| commit | db66e32e0d2ae1f5070faa589aa460b75780ab47 (patch) | |
| tree | feafcfb8f6ae92fabcd4de7d83e839cc301530bc /include/net/pkt_sched.h | |
| parent | f9f3ce835ddce3c669eee869253105f88819888b (diff) | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| download | linux-db66e32e0d2ae1f5070faa589aa460b75780ab47.tar.gz | |
Merge tag 'v4.3-rc1' into MTD -next development
Diffstat (limited to 'include/net/pkt_sched.h')
| -rw-r--r-- | include/net/pkt_sched.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index 2342bf12cb78..401038d2f9b8 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h @@ -110,10 +110,8 @@ static inline void qdisc_run(struct Qdisc *q) __qdisc_run(q); } -int tc_classify_compat(struct sk_buff *skb, const struct tcf_proto *tp, - struct tcf_result *res); int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp, - struct tcf_result *res); + struct tcf_result *res, bool compat_mode); static inline __be16 tc_skb_protocol(const struct sk_buff *skb) { |