From: Greg Kroah-Hartman Date: Sun, 11 Nov 2018 19:25:18 +0000 (-0800) Subject: drop net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch X-Git-Tag: v4.19.2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae58cde3b97e699aab68be974cf30866e9ffcb0f;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch --- diff --git a/queue-4.14/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch b/queue-4.14/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch deleted file mode 100644 index 187fe10a66f..00000000000 --- a/queue-4.14/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch +++ /dev/null @@ -1,38 +0,0 @@ -From foo@baz Sat Nov 10 11:17:18 PST 2018 -From: Ivan Khoronzhuk -Date: Mon, 22 Oct 2018 21:51:36 +0300 -Subject: net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode - -From: Ivan Khoronzhuk - -[ Upstream commit 9737cc99dd14b5b8b9d267618a6061feade8ea68 ] - -After flushing all mcast entries from the table, the ones contained in -mc list of ndev are not restored when promisc mode is toggled off, -because they are considered as synched with ALE, thus, in order to -restore them after promisc mode - reset syncing info. This fix -touches only switch mode devices, including single port boards -like Beagle Bone. - -Fixes: commit 5da1948969bc -("net: ethernet: ti: cpsw: fix lost of mcast packets while rx_mode update") - -Signed-off-by: Ivan Khoronzhuk -Reviewed-by: Grygorii Strashko -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/ti/cpsw.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/ethernet/ti/cpsw.c -+++ b/drivers/net/ethernet/ti/cpsw.c -@@ -601,6 +601,7 @@ static void cpsw_set_promiscious(struct - - /* Clear all mcast from ALE */ - cpsw_ale_flush_multicast(ale, ALE_ALL_PORTS, -1); -+ __dev_mc_unsync(ndev, NULL); - - /* Flood All Unicast Packets to Host port */ - cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 1); diff --git a/queue-4.14/series b/queue-4.14/series index e7d9c95c177..401ef5cc740 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -36,7 +36,6 @@ x86-fpu-remove-second-definition-of-fpu-in-__fpu__restore_sig.patch net-qla3xxx-remove-overflowing-shift-statement.patch selftests-ftrace-add-synthetic-event-syntax-testcase.patch i2c-rcar-cleanup-dma-for-all-kinds-of-failure.patch -net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch locking-lockdep-fix-debug_locks-off-performance-problem.patch ataflop-fix-error-handling-during-setup.patch swim-fix-cleanup-on-setup-error.patch diff --git a/queue-4.18/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch b/queue-4.18/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch deleted file mode 100644 index 368ce12fcc8..00000000000 --- a/queue-4.18/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch +++ /dev/null @@ -1,38 +0,0 @@ -From foo@baz Sat Nov 10 10:48:43 PST 2018 -From: Ivan Khoronzhuk -Date: Mon, 22 Oct 2018 21:51:36 +0300 -Subject: net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode - -From: Ivan Khoronzhuk - -[ Upstream commit 9737cc99dd14b5b8b9d267618a6061feade8ea68 ] - -After flushing all mcast entries from the table, the ones contained in -mc list of ndev are not restored when promisc mode is toggled off, -because they are considered as synched with ALE, thus, in order to -restore them after promisc mode - reset syncing info. This fix -touches only switch mode devices, including single port boards -like Beagle Bone. - -Fixes: commit 5da1948969bc -("net: ethernet: ti: cpsw: fix lost of mcast packets while rx_mode update") - -Signed-off-by: Ivan Khoronzhuk -Reviewed-by: Grygorii Strashko -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/ti/cpsw.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/ethernet/ti/cpsw.c -+++ b/drivers/net/ethernet/ti/cpsw.c -@@ -641,6 +641,7 @@ static void cpsw_set_promiscious(struct - - /* Clear all mcast from ALE */ - cpsw_ale_flush_multicast(ale, ALE_ALL_PORTS, -1); -+ __dev_mc_unsync(ndev, NULL); - - /* Flood All Unicast Packets to Host port */ - cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 1); diff --git a/queue-4.18/series b/queue-4.18/series index 4429e26b7b8..95df47262a0 100644 --- a/queue-4.18/series +++ b/queue-4.18/series @@ -62,7 +62,6 @@ drm-get-ref-on-crtc-commit-object-when-waiting-for-flip_done.patch selftests-ftrace-add-synthetic-event-syntax-testcase.patch i2c-rcar-cleanup-dma-for-all-kinds-of-failure.patch net-socionext-reset-tx-queue-in-ndo_stop.patch -net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch locking-lockdep-fix-debug_locks-off-performance-problem.patch netfilter-xt_nat-fix-dnat-target-for-shifted-portmap-ranges.patch ataflop-fix-error-handling-during-setup.patch diff --git a/queue-4.19/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch b/queue-4.19/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch deleted file mode 100644 index 15610c26f13..00000000000 --- a/queue-4.19/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch +++ /dev/null @@ -1,38 +0,0 @@ -From foo@baz Sat Nov 10 10:51:03 PST 2018 -From: Ivan Khoronzhuk -Date: Mon, 22 Oct 2018 21:51:36 +0300 -Subject: net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode - -From: Ivan Khoronzhuk - -[ Upstream commit 9737cc99dd14b5b8b9d267618a6061feade8ea68 ] - -After flushing all mcast entries from the table, the ones contained in -mc list of ndev are not restored when promisc mode is toggled off, -because they are considered as synched with ALE, thus, in order to -restore them after promisc mode - reset syncing info. This fix -touches only switch mode devices, including single port boards -like Beagle Bone. - -Fixes: commit 5da1948969bc -("net: ethernet: ti: cpsw: fix lost of mcast packets while rx_mode update") - -Signed-off-by: Ivan Khoronzhuk -Reviewed-by: Grygorii Strashko -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/ti/cpsw.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/ethernet/ti/cpsw.c -+++ b/drivers/net/ethernet/ti/cpsw.c -@@ -642,6 +642,7 @@ static void cpsw_set_promiscious(struct - - /* Clear all mcast from ALE */ - cpsw_ale_flush_multicast(ale, ALE_ALL_PORTS, -1); -+ __dev_mc_unsync(ndev, NULL); - - /* Flood All Unicast Packets to Host port */ - cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 1); diff --git a/queue-4.19/series b/queue-4.19/series index 6dcfdc35f61..be9549d50c6 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -46,7 +46,6 @@ x86-mm-pat-disable-preemption-around-__flush_tlb_all.patch x86-numa_emulation-fix-uniform-split-numa-emulation.patch arm-dts-exynos-disable-pull-control-for-max8997-interrupts-on-origen.patch net-socionext-reset-tx-queue-in-ndo_stop.patch -net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch net-loopback-clear-skb-tstamp-before-netif_rx.patch locking-lockdep-fix-debug_locks-off-performance-problem.patch netfilter-xt_nat-fix-dnat-target-for-shifted-portmap-ranges.patch diff --git a/queue-4.9/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch b/queue-4.9/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch deleted file mode 100644 index 76725706da4..00000000000 --- a/queue-4.9/net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch +++ /dev/null @@ -1,38 +0,0 @@ -From foo@baz Sat Nov 10 11:24:34 PST 2018 -From: Ivan Khoronzhuk -Date: Mon, 22 Oct 2018 21:51:36 +0300 -Subject: net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode - -From: Ivan Khoronzhuk - -[ Upstream commit 9737cc99dd14b5b8b9d267618a6061feade8ea68 ] - -After flushing all mcast entries from the table, the ones contained in -mc list of ndev are not restored when promisc mode is toggled off, -because they are considered as synched with ALE, thus, in order to -restore them after promisc mode - reset syncing info. This fix -touches only switch mode devices, including single port boards -like Beagle Bone. - -Fixes: commit 5da1948969bc -("net: ethernet: ti: cpsw: fix lost of mcast packets while rx_mode update") - -Signed-off-by: Ivan Khoronzhuk -Reviewed-by: Grygorii Strashko -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/ti/cpsw.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/ethernet/ti/cpsw.c -+++ b/drivers/net/ethernet/ti/cpsw.c -@@ -590,6 +590,7 @@ static void cpsw_set_promiscious(struct - - /* Clear all mcast from ALE */ - cpsw_ale_flush_multicast(ale, ALE_ALL_PORTS, -1); -+ __dev_mc_unsync(ndev, NULL); - - /* Flood All Unicast Packets to Host port */ - cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 1); diff --git a/queue-4.9/series b/queue-4.9/series index e5439d5fb0b..51107e663fa 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -24,7 +24,6 @@ x86-fpu-remove-second-definition-of-fpu-in-__fpu__restore_sig.patch net-qla3xxx-remove-overflowing-shift-statement.patch selftests-ftrace-add-synthetic-event-syntax-testcase.patch i2c-rcar-cleanup-dma-for-all-kinds-of-failure.patch -net-ethernet-ti-cpsw-unsync-mcast-entries-while-switch-promisc-mode.patch locking-lockdep-fix-debug_locks-off-performance-problem.patch ataflop-fix-error-handling-during-setup.patch swim-fix-cleanup-on-setup-error.patch