From: Arnd Bergmann <arnd@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Lukas Wunner <lukas@wunner.de>
Cc: Arnd Bergmann <arnd@arndb.de>,
Willem de Bruijn <willemb@google.com>,
Hui Tang <tanghui20@huawei.com>,
Emil Renner Berthing <kernel@esmil.dk>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Alexander Lobakin <alobakin@pm.me>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT
Date: Fri, 29 Oct 2021 13:30:51 +0200 [thread overview]
Message-ID: <20211029113102.769823-1-arnd@kernel.org> (raw)
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
next reply other threads:[~2021-10-29 11:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 11:30 Arnd Bergmann [this message]
2021-10-29 13:10 ` [PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211029113102.769823-1-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=alobakin@pm.me \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=kernel@esmil.dk \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=tanghui20@huawei.com \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).