drop queue-4.14/net-stmmac-dwmac1000-disable-acs-if-enhanced-descs-are-not-used.patch

diff --git a/queue-4.14/net-stmmac-dwmac1000-disable-acs-if-enhanced-descs-are-not-used.patch b/queue-4.14/net-stmmac-dwmac1000-disable-acs-if-enhanced-descs-are-not-used.patch
deleted file mode 100644 (file)
index d3b68b8..0000000
--- a/queue-4.14/net-stmmac-dwmac1000-disable-acs-if-enhanced-descs-are-not-used.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From foo@baz Sun 15 Mar 2020 12:39:05 PM CET
-From: Remi Pommarel <repk@triplefau.lt>
-Date: Sun, 8 Mar 2020 10:25:56 +0100
-Subject: net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used
-
-From: Remi Pommarel <repk@triplefau.lt>
-
-[ Upstream commit b723bd933980f4956dabc8a8d84b3e83be8d094c ]
-
-ACS (auto PAD/FCS stripping) removes FCS off 802.3 packets (LLC) so that
-there is no need to manually strip it for such packets. The enhanced DMA
-descriptors allow to flag LLC packets so that the receiving callback can
-use that to strip FCS manually or not. On the other hand, normal
-descriptors do not support that.
-
-Thus in order to not truncate LLC packet ACS should be disabled when
-using normal DMA descriptors.
-
-Fixes: 47dd7a540b8a0 ("net: add support for STMicroelectronics Ethernet controllers.")
-Signed-off-by: Remi Pommarel <repk@triplefau.lt>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
-@@ -33,6 +33,7 @@
- static void dwmac1000_core_init(struct mac_device_info *hw,
-                               struct net_device *dev)
- {
-+      struct stmmac_priv *priv = netdev_priv(dev);
-       void __iomem *ioaddr = hw->pcsr;
-       u32 value = readl(ioaddr + GMAC_CONTROL);
-       int mtu = dev->mtu;
-@@ -44,7 +45,7 @@ static void dwmac1000_core_init(struct m
-        * Broadcom tags can look like invalid LLC/SNAP packets and cause the
-        * hardware to truncate packets on reception.
-        */
--      if (netdev_uses_dsa(dev))
-+      if (netdev_uses_dsa(dev) || !priv->plat->enh_desc)
-               value &= ~GMAC_CONTROL_ACS;
- 
-       if (mtu > 1500)

diff --git a/queue-4.14/series b/queue-4.14/series
index abdff1f5ad7fdd2b0b87684885b036aac24d9a0d..cd161c22a5485487006986d5fb887da21ecfee71 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -9,7 +9,6 @@ netlink-use-netlink-header-as-base-to-calculate-bad-attribute-offset.patch
 net-macsec-update-sci-upon-mac-address-change.patch
 net-nfc-fix-bounds-checking-bugs-on-pipe.patch
 net-packet-tpacket_rcv-do-not-increment-ring-index-on-drop.patch
-net-stmmac-dwmac1000-disable-acs-if-enhanced-descs-are-not-used.patch
 r8152-check-disconnect-status-after-long-sleep.patch
 sfc-detach-from-cb_page-in-efx_copy_channel.patch
 bnxt_en-reinitialize-irqs-when-mtu-is-modified.patch