[PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT

[PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The driver no longer depends on this option, but it fails to
build if it's disabled because the skb->tc_skip_classify is
hidden behind an #ifdef:

drivers/net/ifb.c:81:8: error: no member named 'tc_skip_classify' in 'struct sk_buff'
                skb->tc_skip_classify = 1;

Use the same #ifdef around the assignment.

Fixes: 046178e726c2 ("ifb: Depend on netfilter alternatively to tc")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/ifb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 2c319dd27f29..31f522b8e54e 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -78,7 +78,9 @@ static void ifb_ri_tasklet(struct tasklet_struct *t)
 	while ((skb = __skb_dequeue(&txp->tq)) != NULL) {
 		/* Skip tc and netfilter to prevent redirection loop. */
 		skb->redirected = 0;
+#ifdef CONFIG_NET_CLS_ACT
 		skb->tc_skip_classify = 1;
+#endif
 		nf_skip_egress(skb, true);
 
 		u64_stats_update_begin(&txp->tsync);
-- 
2.29.2

Re: [PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

On Fri, 29 Oct 2021 13:30:51 +0200 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The driver no longer depends on this option, but it fails to
> build if it's disabled because the skb->tc_skip_classify is
> hidden behind an #ifdef:
> 
> drivers/net/ifb.c:81:8: error: no member named 'tc_skip_classify' in 'struct sk_buff'
>                 skb->tc_skip_classify = 1;
> 
> [...]

Here is the summary with links:
  - [net-next] ifb: fix building without CONFIG_NET_CLS_ACT
    https://git.kernel.org/netdev/net-next/c/7444d706be31

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html