From 1e9c64320a6e1a5ea8f63f815db45f37b28520cf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Nov 2021 15:25:40 +0100 Subject: [PATCH] drop ifb patches from a bunch of kernels --- ...end-on-netfilter-alternatively-to-tc.patch | 33 ---------------- ...-building-without-config_net_cls_act.patch | 38 ------------------- queue-4.14/series | 2 - ...end-on-netfilter-alternatively-to-tc.patch | 33 ---------------- ...-building-without-config_net_cls_act.patch | 38 ------------------- queue-4.19/series | 2 - ...end-on-netfilter-alternatively-to-tc.patch | 33 ---------------- queue-4.9/series | 1 - ...end-on-netfilter-alternatively-to-tc.patch | 33 ---------------- ...-building-without-config_net_cls_act.patch | 38 ------------------- queue-5.4/series | 2 - 11 files changed, 253 deletions(-) delete mode 100644 queue-4.14/ifb-depend-on-netfilter-alternatively-to-tc.patch delete mode 100644 queue-4.14/ifb-fix-building-without-config_net_cls_act.patch delete mode 100644 queue-4.19/ifb-depend-on-netfilter-alternatively-to-tc.patch delete mode 100644 queue-4.19/ifb-fix-building-without-config_net_cls_act.patch delete mode 100644 queue-4.9/ifb-depend-on-netfilter-alternatively-to-tc.patch delete mode 100644 queue-5.4/ifb-depend-on-netfilter-alternatively-to-tc.patch delete mode 100644 queue-5.4/ifb-fix-building-without-config_net_cls_act.patch diff --git a/queue-4.14/ifb-depend-on-netfilter-alternatively-to-tc.patch b/queue-4.14/ifb-depend-on-netfilter-alternatively-to-tc.patch deleted file mode 100644 index 83ed858db68..00000000000 --- a/queue-4.14/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 -@@ -104,7 +104,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.14/ifb-fix-building-without-config_net_cls_act.patch b/queue-4.14/ifb-fix-building-without-config_net_cls_act.patch deleted file mode 100644 index 8cd227ed403..00000000000 --- a/queue-4.14/ifb-fix-building-without-config_net_cls_act.patch +++ /dev/null @@ -1,38 +0,0 @@ -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.14/series b/queue-4.14/series index b3d68c223cb..4d21825cf4c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -41,7 +41,6 @@ ath10k-fix-division-by-zero-in-send-path.patch pci-mark-atheros-qca6174-to-avoid-bus-reset.patch rtl8187-fix-control-message-timeouts.patch evm-mark-evm_fixmode-as-__ro_after_init.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 libata-fix-checking-of-dma-state.patch @@ -53,7 +52,6 @@ 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 alsa-mixer-oss-fix-racy-access-to-slots.patch alsa-mixer-fix-deadlock-in-snd_mixer_oss_set_volume.patch xen-balloon-add-late_initcall_sync-for-initial-ballooning-done.patch diff --git a/queue-4.19/ifb-depend-on-netfilter-alternatively-to-tc.patch b/queue-4.19/ifb-depend-on-netfilter-alternatively-to-tc.patch deleted file mode 100644 index 83ed858db68..00000000000 --- a/queue-4.19/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 -@@ -104,7 +104,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.19/ifb-fix-building-without-config_net_cls_act.patch b/queue-4.19/ifb-fix-building-without-config_net_cls_act.patch deleted file mode 100644 index 8cd227ed403..00000000000 --- a/queue-4.19/ifb-fix-building-without-config_net_cls_act.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 3d61595b719..26088f621d5 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -53,7 +53,6 @@ ath10k-fix-division-by-zero-in-send-path.patch pci-mark-atheros-qca6174-to-avoid-bus-reset.patch rtl8187-fix-control-message-timeouts.patch evm-mark-evm_fixmode-as-__ro_after_init.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 libata-fix-checking-of-dma-state.patch @@ -69,7 +68,6 @@ 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 alsa-mixer-oss-fix-racy-access-to-slots.patch alsa-mixer-fix-deadlock-in-snd_mixer_oss_set_volume.patch xen-balloon-add-late_initcall_sync-for-initial-ballooning-done.patch diff --git a/queue-4.9/ifb-depend-on-netfilter-alternatively-to-tc.patch b/queue-4.9/ifb-depend-on-netfilter-alternatively-to-tc.patch deleted file mode 100644 index 83ed858db68..00000000000 --- a/queue-4.9/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 -@@ -104,7 +104,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.9/series b/queue-4.9/series index 50bc8b11c2d..48fd2cae444 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -35,7 +35,6 @@ ath6kl-fix-control-message-timeout.patch pci-mark-atheros-qca6174-to-avoid-bus-reset.patch rtl8187-fix-control-message-timeouts.patch evm-mark-evm_fixmode-as-__ro_after_init.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 wcn36xx-handle-connection-loss-indication.patch diff --git a/queue-5.4/ifb-depend-on-netfilter-alternatively-to-tc.patch b/queue-5.4/ifb-depend-on-netfilter-alternatively-to-tc.patch deleted file mode 100644 index 6becbca1d1f..00000000000 --- a/queue-5.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 - select NET_REDIRECT - ---help--- - This is an intermediate driver that allows sharing of diff --git a/queue-5.4/ifb-fix-building-without-config_net_cls_act.patch b/queue-5.4/ifb-fix-building-without-config_net_cls_act.patch deleted file mode 100644 index 801f5913483..00000000000 --- a/queue-5.4/ifb-fix-building-without-config_net_cls_act.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 -@@ -76,7 +76,9 @@ static void ifb_ri_tasklet(unsigned long - - while ((skb = __skb_dequeue(&txp->tq)) != NULL) { - skb->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-5.4/series b/queue-5.4/series index f0ab36b87e7..344f5548529 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -74,7 +74,6 @@ ath10k-fix-division-by-zero-in-send-path.patch pci-mark-atheros-qca6174-to-avoid-bus-reset.patch rtl8187-fix-control-message-timeouts.patch evm-mark-evm_fixmode-as-__ro_after_init.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 libata-fix-checking-of-dma-state.patch @@ -93,7 +92,6 @@ can-j1939-j1939_tp_cmd_recv-ignore-abort-message-in-the-bam-transport.patch can-j1939-j1939_can_recv-ignore-messages-with-invalid-source-address.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 alsa-mixer-oss-fix-racy-access-to-slots.patch alsa-mixer-fix-deadlock-in-snd_mixer_oss_set_volume.patch xen-balloon-add-late_initcall_sync-for-initial-ballooning-done.patch -- 2.47.2