Message ID | 1487156270-31132-1-git-send-email-jiri@resnulli.us |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
2017-02-15, 11:57:50 +0100, Jiri Pirko wrote: > From: Jiri Pirko <jiri@mellanox.com> > > This fixes broken build for !NET_CLS: > > net/built-in.o: In function `fq_codel_destroy': > /home/sab/linux/net-next/net/sched/sch_fq_codel.c:468: undefined reference to `tcf_destroy_chain' > > Fixes: cf1facda2f61 ("sched: move tcf_proto_destroy and tcf_destroy_chain helpers into cls_api") > Reported-by: Sabrina Dubroca <sd@queasysnail.net> > Signed-off-by: Jiri Pirko <jiri@mellanox.com> Thanks for the fix. Tested-by: Sabrina Dubroca <sd@queasysnail.net>
From: Jiri Pirko <jiri@resnulli.us> Date: Wed, 15 Feb 2017 11:57:50 +0100 > From: Jiri Pirko <jiri@mellanox.com> > > This fixes broken build for !NET_CLS: > > net/built-in.o: In function `fq_codel_destroy': > /home/sab/linux/net-next/net/sched/sch_fq_codel.c:468: undefined reference to `tcf_destroy_chain' > > Fixes: cf1facda2f61 ("sched: move tcf_proto_destroy and tcf_destroy_chain helpers into cls_api") > Reported-by: Sabrina Dubroca <sd@queasysnail.net> > Signed-off-by: Jiri Pirko <jiri@mellanox.com> Applied, thanks Jiri.
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 71b266c..be5c12a 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -17,7 +17,13 @@ struct tcf_walker { int register_tcf_proto_ops(struct tcf_proto_ops *ops); int unregister_tcf_proto_ops(struct tcf_proto_ops *ops); +#ifdef CONFIG_NET_CLS void tcf_destroy_chain(struct tcf_proto __rcu **fl); +#else +static inline void tcf_destroy_chain(struct tcf_proto __rcu **fl) +{ +} +#endif static inline unsigned long __cls_set_class(unsigned long *clp, unsigned long cl)