This is a note to let you know that I've just added the patch titled
ifb: fix building without CONFIG_NET_CLS_ACT
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ifb-fix-building-without-config_net_cls_act.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7444d706be31753f65052c7f6325fc8470cc1789 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@xxxxxxxx>
Date: Fri, 29 Oct 2021 13:30:51 +0200
Subject: ifb: fix building without CONFIG_NET_CLS_ACT
From: Arnd Bergmann <arnd@xxxxxxxx>
commit 7444d706be31753f65052c7f6325fc8470cc1789 upstream.
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@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ifb.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -79,7 +79,9 @@ static void ifb_ri_tasklet(unsigned long
while ((skb = __skb_dequeue(&txp->tq)) != NULL) {
skb->tc_redirected = 0;
+#ifdef CONFIG_NET_CLS_ACT
skb->tc_skip_classify = 1;
+#endif
u64_stats_update_begin(&txp->tsync);
txp->tx_packets++;
Patches currently in stable-queue which might be from arnd@xxxxxxxx are
queue-4.19/hyperv-vmbus-include-linux-bitops.h.patch
queue-4.19/ifb-fix-building-without-config_net_cls_act.patch
queue-4.19/mmc-winbond-don-t-build-on-m68k.patch
