diff mbox series

[net-next] ifb: fix building without CONFIG_NET_CLS_ACT

Message ID 20211029113102.769823-1-arnd@kernel.org (mailing list archive)
State Accepted
Commit 7444d706be31753f65052c7f6325fc8470cc1789
Delegated to: Netdev Maintainers
Headers show
Series [net-next] ifb: fix building without CONFIG_NET_CLS_ACT | expand

Checks

Context Check Description
netdev/cover_letter success Single patches do not need cover letters
netdev/fixes_present success Fixes tag not required for -next series
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net-next
netdev/subject_prefix success Link
netdev/cc_maintainers success CCed 3 of 3 maintainers
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Fixes tag looks correct
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 9 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success No static functions without inline keyword in header files

Commit Message

Arnd Bergmann Oct. 29, 2021, 11:30 a.m. UTC 
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(+)

Comments

patchwork-bot+netdevbpf@kernel.org Oct. 29, 2021, 1:10 p.m. UTC | #1 
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!
diff mbox series

Patch

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);