* [PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT
@ 2021-10-29 11:30 Arnd Bergmann
2021-10-29 13:10 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2021-10-29 11:30 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Lukas Wunner
Cc: Arnd Bergmann, Willem de Bruijn, Hui Tang, Emil Renner Berthing,
Pablo Neira Ayuso, Alexander Lobakin, netdev, linux-kernel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT
2021-10-29 11:30 [PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT Arnd Bergmann
@ 2021-10-29 13:10 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-10-29 13:10 UTC (permalink / raw)
To: Arnd Bergmann
Cc: davem, kuba, lukas, arnd, willemb, tanghui20, kernel, pablo,
alobakin, netdev, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-29 13:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-29 11:30 [PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT Arnd Bergmann
2021-10-29 13:10 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.