diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-10 11:38:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-10 11:38:10 -0500 |
| commit | 94134bf89a4747ac370ffea614a2ba483edf0ccc (patch) | |
| tree | 0ab1c7617292ca22d3d4f627a7ead0ccaa5922ce /include | |
| parent | b4c4ebcf3ca22bf9b04fa9c6ccfbfdfe0a256d07 (diff) | |
| parent | 40c81b25b16cd871afe70630c131bd2544848d1f (diff) | |
Merge branch 'sched-cls_api-small-cleanup'
Jiri Pirko says:
====================
sched: cls_api: small cleanup
This patchset makes couple of things in cls_api code a bit nicer and easier
for reader to digest.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/pkt_cls.h | 2 | ||||
| -rw-r--r-- | include/net/sch_generic.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index dabb00af46a0..71b266cd63d4 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -17,6 +17,8 @@ struct tcf_walker { int register_tcf_proto_ops(struct tcf_proto_ops *ops); int unregister_tcf_proto_ops(struct tcf_proto_ops *ops); +void tcf_destroy_chain(struct tcf_proto __rcu **fl); + static inline unsigned long __cls_set_class(unsigned long *clp, unsigned long cl) { diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index e2f426f6d62f..aeec4086afb2 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -405,8 +405,6 @@ struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, const struct Qdisc_ops *ops, u32 parentid); void __qdisc_calculate_pkt_len(struct sk_buff *skb, const struct qdisc_size_table *stab); -bool tcf_destroy(struct tcf_proto *tp, bool force); -void tcf_destroy_chain(struct tcf_proto __rcu **fl); int skb_do_redirect(struct sk_buff *); static inline void skb_reset_tc(struct sk_buff *skb) |