From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 29 Oct 2021 11:30:51 +0000 (+0200)
Subject: ifb: fix building without CONFIG_NET_CLS_ACT
X-Git-Tag: v6.1-rc5~2768^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7444d706be31753f65052c7f6325fc8470cc1789;p=platform%2Fkernel%2Flinux-starfive.git

ifb: fix building without CONFIG_NET_CLS_ACT

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

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