[linux] 02/02: mv643xx_eth: Re-enable TSO, fixed upstream in 4.3

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit e317536be0f2901310f48411ea9aea9a9c4f6708
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Nov 7 14:23:40 2015 +0000

    mv643xx_eth: Re-enable TSO, fixed upstream in 4.3
---
 debian/changelog                                   |  1 +
 .../all/net-mv643xx-disable-tso-by-default.patch   | 54 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 826671a..ea2284f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux (4.3-1~exp2) UNRELEASED; urgency=medium
 
   * qxl: Enable by default (Closes: #779515)
+  * mv643xx_eth: Re-enable TSO, fixed upstream in 4.3
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 07 Nov 2015 14:18:48 +0000
 
diff --git a/debian/patches/bugfix/all/net-mv643xx-disable-tso-by-default.patch b/debian/patches/bugfix/all/net-mv643xx-disable-tso-by-default.patch
deleted file mode 100644
index f4d0735..0000000
--- a/debian/patches/bugfix/all/net-mv643xx-disable-tso-by-default.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From patchwork Sat Nov  1 15:30:20 2014
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [1/1] net: mv643xx_eth: Make TSO disabled by default
-From: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
-X-Patchwork-Id: 405792
-Message-Id: <1414855820-15094-2-git-send-email-ezequiel.garcia at free-electrons.com>
-To: <netdev at vger.kernel.org>, David Miller <davem at davemloft.net>
-Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>,
- Gregory Clement <gregory.clement at free-electrons.com>,
- Tawfik Bayouk <tawfik at marvell.com>, Lior Amsalem <alior at marvell.com>,
- Nadav Haklai <nadavh at marvell.com>,
- Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
-Date: Sat,  1 Nov 2014 12:30:20 -0300
-Origin: http://lkml.kernel.org/g/<1414855820-15094-2-git-send-email-ezequiel.garcia@free-electrons.com>
-
-Data corruption has been observed to be produced by TSO. For instance,
-accessing files on a NFS-server with TSO enabled results in different data
-transferred each time.
-
-This has been observed only on Kirkwood platforms, i.e. with the mv643xx_eth
-driver. Same tests on platforms using the mvneta ethernet driver have
-passed without errors.
-
-Make TSO disabled by default for now, until we can found a proper fix
-for the regression.
-
-Fixes: 3ae8f4e0b98 ('net: mv643xx_eth: Implement software TSO')
-Reported-by: Slawomir Gajzner <slawomir.gajzner at gmail.com>
-Reported-by: Julien D'Ascenzio <jdascenzio at yahoo.fr>
-Signed-off-by: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
----
- drivers/net/ethernet/marvell/mv643xx_eth.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
-index b151a94..8b72780 100644
---- a/drivers/net/ethernet/marvell/mv643xx_eth.c
-+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
-@@ -3110,11 +3110,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
- 	dev->watchdog_timeo = 2 * HZ;
- 	dev->base_addr = 0;
- 
--	dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
-+	dev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
- 	dev->vlan_features = dev->features;
- 
- 	dev->features |= NETIF_F_RXCSUM;
--	dev->hw_features = dev->features;
-+	dev->hw_features = dev->features  | NETIF_F_TSO;
- 
- 	dev->priv_flags |= IFF_UNICAST_FLT;
- 	dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;
diff --git a/debian/patches/series b/debian/patches/series
index f3a6ae5..d590375 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,7 +63,6 @@ bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
 bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
 bugfix/all/disable-some-marvell-phys.patch
 bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
-bugfix/all/net-mv643xx-disable-tso-by-default.patch
 
 # Reproducible docs
 bugfix/all/documentation-avoid-creating-man-pages-in-source-tree.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git