From: Greg Kroah-Hartman Date: Sun, 14 Nov 2021 12:51:50 +0000 (+0100) Subject: drop queue-4.4/ifb-depend-on-netfilter-alternatively-to-tc.patch X-Git-Tag: v5.4.160~104 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7b24d4e701aebdb79daec2af394810648f304c1;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.4/ifb-depend-on-netfilter-alternatively-to-tc.patch --- diff --git a/queue-4.4/ifb-depend-on-netfilter-alternatively-to-tc.patch b/queue-4.4/ifb-depend-on-netfilter-alternatively-to-tc.patch deleted file mode 100644 index ae1444c58bb..00000000000 --- a/queue-4.4/ifb-depend-on-netfilter-alternatively-to-tc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 046178e726c2977d686ba5e07105d5a6685c830e Mon Sep 17 00:00:00 2001 -From: Lukas Wunner -Date: Tue, 26 Oct 2021 07:15:32 +0200 -Subject: ifb: Depend on netfilter alternatively to tc - -From: Lukas Wunner - -commit 046178e726c2977d686ba5e07105d5a6685c830e upstream. - -IFB originally depended on NET_CLS_ACT for traffic redirection. -But since v4.5, that may be achieved with NFT_FWD_NETDEV as well. - -Fixes: 39e6dea28adc ("netfilter: nf_tables: add forward expression to the netdev family") -Signed-off-by: Lukas Wunner -Cc: # v4.5+: bcfabee1afd9: netfilter: nft_fwd_netdev: allow to redirect to ifb via ingress -Cc: # v4.5+ -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/Kconfig -+++ b/drivers/net/Kconfig -@@ -105,7 +105,7 @@ config NET_FC - - config IFB - tristate "Intermediate Functional Block support" -- depends on NET_CLS_ACT -+ depends on NET_ACT_MIRRED || NFT_FWD_NETDEV - ---help--- - This is an intermediate driver that allows sharing of - resources. diff --git a/queue-4.4/series b/queue-4.4/series index a6ef0ec4ae2..235743c1e71 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -27,7 +27,6 @@ mwifiex-fix-division-by-zero-in-fw-download-path.patch ath6kl-fix-division-by-zero-in-send-path.patch ath6kl-fix-control-message-timeout.patch pci-mark-atheros-qca6174-to-avoid-bus-reset.patch -ifb-depend-on-netfilter-alternatively-to-tc.patch wcn36xx-fix-ht40-capability-for-2ghz-band.patch mwifiex-read-a-pci-register-after-writing-the-tx-ring-write-pointer.patch signal-remove-the-bogus-sigkill_pending-in-ptrace_stop.patch