| Message ID | 20221227140459.3836710-1-pctammela@mojatatu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 40cab44b9089a41f71bbd0eff753eb91d5dafd68 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net/sched: fix retpoline wrapper compilation on configs without tc filters | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Tue, 27 Dec 2022 11:04:59 -0300 you wrote: > Rudi reports a compilation failure on x86_64 when CONFIG_NET_CLS or > CONFIG_NET_CLS_ACT is not set but CONFIG_RETPOLINE is set. > A misplaced '#endif' was causing the issue. > > Fixes: 7f0e810220e2 ("net/sched: add retpoline wrapper for tc") > > Tested-by: Rudi Heitbaum <rudi@heitbaum.com> > Signed-off-by: Pedro Tammela <pctammela@mojatatu.com> > > [...] Here is the summary with links: - net/sched: fix retpoline wrapper compilation on configs without tc filters https://git.kernel.org/netdev/net/c/40cab44b9089 You are awesome, thank you!
diff --git a/include/net/tc_wrapper.h b/include/net/tc_wrapper.h index ceed2fc089ff..d323fffb839a 100644 --- a/include/net/tc_wrapper.h +++ b/include/net/tc_wrapper.h @@ -216,6 +216,8 @@ static inline int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp, return tp->classify(skb, tp, res); } +#endif /* CONFIG_NET_CLS */ + static inline void tc_wrapper_init(void) { #ifdef CONFIG_X86 @@ -224,8 +226,6 @@ static inline void tc_wrapper_init(void) #endif } -#endif /* CONFIG_NET_CLS */ - #else #define TC_INDIRECT_SCOPE static
Rudi reports a compilation failure on x86_64 when CONFIG_NET_CLS or CONFIG_NET_CLS_ACT is not set but CONFIG_RETPOLINE is set. A misplaced '#endif' was causing the issue. Fixes: 7f0e810220e2 ("net/sched: add retpoline wrapper for tc") Tested-by: Rudi Heitbaum <rudi@heitbaum.com> Signed-off-by: Pedro Tammela <pctammela@mojatatu.com> --- include/net/tc_wrapper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)