From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 14 Nov 2021 12:51:57 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v5.4.160~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b6dac7e466db7b8d4dd4d76b535381ef3296045;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	ifb-fix-building-without-config_net_cls_act.patch
---

diff --git a/queue-4.14/ifb-fix-building-without-config_net_cls_act.patch b/queue-4.14/ifb-fix-building-without-config_net_cls_act.patch
new file mode 100644
index 00000000000..8cd227ed403
--- /dev/null
+++ b/queue-4.14/ifb-fix-building-without-config_net_cls_act.patch
@@ -0,0 +1,38 @@
+From 7444d706be31753f65052c7f6325fc8470cc1789 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Fri, 29 Oct 2021 13:30:51 +0200
+Subject: ifb: fix building without CONFIG_NET_CLS_ACT
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+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@arndb.de>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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++;
diff --git a/queue-4.14/series b/queue-4.14/series
index 7e205ac0731..5bf29c49541 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -53,3 +53,4 @@ power-supply-max17042_battery-prevent-int-underflow-in-set_soc_threshold.patch
 power-supply-max17042_battery-use-vfsoc-for-capacity-when-no-rsns.patch
 powerpc-85xx-fix-oops-when-mpc85xx_smp_guts_ids-node-cannot-be-found.patch
 serial-core-fix-initializing-and-restoring-termios-speed.patch
+ifb-fix-building-without-config_net_cls_act.patch