drop net-dsa-bcm_sf2-force-pause-link-settings.patch from 4.9 and 4.14

diff --git a/queue-4.14/net-dsa-bcm_sf2-force-pause-link-settings.patch b/queue-4.14/net-dsa-bcm_sf2-force-pause-link-settings.patch
deleted file mode 100644 (file)
index eba10d5..0000000
--- a/queue-4.14/net-dsa-bcm_sf2-force-pause-link-settings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7c97bc0128b2eecc703106112679a69d446d1a12 Mon Sep 17 00:00:00 2001
-From: Doug Berger <opendmb@gmail.com>
-Date: Wed, 22 Jun 2022 20:02:04 -0700
-Subject: net: dsa: bcm_sf2: force pause link settings
-
-From: Doug Berger <opendmb@gmail.com>
-
-commit 7c97bc0128b2eecc703106112679a69d446d1a12 upstream.
-
-The pause settings reported by the PHY should also be applied to the GMII port
-status override otherwise the switch will not generate pause frames towards the
-link partner despite the advertisement saying otherwise.
-
-Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver")
-Signed-off-by: Doug Berger <opendmb@gmail.com>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Link: https://lore.kernel.org/r/20220623030204.1966851-1-f.fainelli@gmail.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/dsa/bcm_sf2.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/net/dsa/bcm_sf2.c
-+++ b/drivers/net/dsa/bcm_sf2.c
-@@ -701,6 +701,11 @@ force_link:
-               reg |= LINK_STS;
-       if (phydev->duplex == DUPLEX_FULL)
-               reg |= DUPLX_MODE;
-+      if (phydev->pause) {
-+              if (phydev->asym_pause)
-+                      reg |= TXFLOW_CNTL;
-+              reg |= RXFLOW_CNTL;
-+      }
- 
-       core_writel(priv, reg, offset);
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index 600dbc990d502d01fd639ab7ede05208d932a08e..c6870241fad13afa447ec3305743e98ee879b8be 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -16,7 +16,6 @@ nfc-nfcmrvl-fix-irq_of_parse_and_map-return-value.patch
 nfc-nxp-nci-don-t-issue-a-zero-length-i2c_master_read.patch
 xen-gntdev-avoid-blocking-in-unmap_grant_pages.patch
 hwmon-ibmaem-don-t-call-platform_device_del-if-platf.patch
-net-dsa-bcm_sf2-force-pause-link-settings.patch
 sit-use-min.patch
 ipv6-sit-fix-ipip6_tunnel_get_prl-return-value.patch
 net-rename-and-export-copy_skb_header.patch

diff --git a/queue-4.9/net-dsa-bcm_sf2-force-pause-link-settings.patch b/queue-4.9/net-dsa-bcm_sf2-force-pause-link-settings.patch
deleted file mode 100644 (file)
index ceac1aa..0000000
--- a/queue-4.9/net-dsa-bcm_sf2-force-pause-link-settings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7c97bc0128b2eecc703106112679a69d446d1a12 Mon Sep 17 00:00:00 2001
-From: Doug Berger <opendmb@gmail.com>
-Date: Wed, 22 Jun 2022 20:02:04 -0700
-Subject: net: dsa: bcm_sf2: force pause link settings
-
-From: Doug Berger <opendmb@gmail.com>
-
-commit 7c97bc0128b2eecc703106112679a69d446d1a12 upstream.
-
-The pause settings reported by the PHY should also be applied to the GMII port
-status override otherwise the switch will not generate pause frames towards the
-link partner despite the advertisement saying otherwise.
-
-Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver")
-Signed-off-by: Doug Berger <opendmb@gmail.com>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Link: https://lore.kernel.org/r/20220623030204.1966851-1-f.fainelli@gmail.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/dsa/bcm_sf2.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/net/dsa/bcm_sf2.c
-+++ b/drivers/net/dsa/bcm_sf2.c
-@@ -671,6 +671,11 @@ force_link:
-               reg |= LINK_STS;
-       if (phydev->duplex == DUPLEX_FULL)
-               reg |= DUPLX_MODE;
-+      if (phydev->pause) {
-+              if (phydev->asym_pause)
-+                      reg |= TXFLOW_CNTL;
-+              reg |= RXFLOW_CNTL;
-+      }
- 
-       core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port));
- 

diff --git a/queue-4.9/series b/queue-4.9/series
index 6e2857251867095eb583796e49c03f35d131e356..953f59c9f1f63a6697e034537d6ae0dea6fadb54 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -13,7 +13,6 @@ nfc-nfcmrvl-fix-irq_of_parse_and_map-return-value.patch
 nfc-nxp-nci-don-t-issue-a-zero-length-i2c_master_read.patch
 xen-gntdev-avoid-blocking-in-unmap_grant_pages.patch
 hwmon-ibmaem-don-t-call-platform_device_del-if-platf.patch
-net-dsa-bcm_sf2-force-pause-link-settings.patch
 sit-use-min.patch
 ipv6-sit-fix-ipip6_tunnel_get_prl-return-value.patch
 net-rename-and-export-copy_skb_header.patch