From 061eafbf9469b7f5008503590bb3721bd4156278 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 14 Nov 2021 13:52:18 +0100 Subject: [PATCH] 4.19-stable patches added patches: ifb-fix-building-without-config_net_cls_act.patch --- ...-building-without-config_net_cls_act.patch | 38 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 39 insertions(+) create mode 100644 queue-4.19/ifb-fix-building-without-config_net_cls_act.patch diff --git a/queue-4.19/ifb-fix-building-without-config_net_cls_act.patch b/queue-4.19/ifb-fix-building-without-config_net_cls_act.patch new file mode 100644 index 00000000000..8cd227ed403 --- /dev/null +++ b/queue-4.19/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 +Date: Fri, 29 Oct 2021 13:30:51 +0200 +Subject: ifb: fix building without CONFIG_NET_CLS_ACT + +From: Arnd Bergmann + +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 +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + 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.19/series b/queue-4.19/series index 0f1ec8debea..7861cff2024 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -69,3 +69,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 -- 2.47.2