net/sched: fix retpoline wrapper compilation on configs without tc filters

tammela · davem330 · commit 40cab44b9089 · 2022-12-28T12:11:32.000Z
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: 7f0e810 ("net/sched: add retpoline wrapper for tc") Tested-by: Rudi Heitbaum <rudi@heitbaum.com> Signed-off-by: Pedro Tammela <pctammela@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,8 @@ static inline int tc_classify(struct sk_buff skb, const struct tcf_proto tp,`
`216`	`216`	`return tp->classify(skb, tp, res);`
`217`	`217`	`}`
`218`	`218`
	`219`	`+#endif /* CONFIG_NET_CLS */`
	`220`	`+`
`219`	`221`	`static inline void tc_wrapper_init(void)`
`220`	`222`	`{`
`221`	`223`	`#ifdef CONFIG_X86`
`@@ -224,8 +226,6 @@ static inline void tc_wrapper_init(void)`
`224`	`226`	`#endif`
`225`	`227`	`}`
`226`	`228`
`227`		`-#endif /* CONFIG_NET_CLS */`
`228`		`-`
`229`	`229`	`#else`
`230`	`230`
`231`	`231`	`#define TC_INDIRECT_SCOPE static`