core/linux-kirkwood-dt to 4.12.7-1

archlinuxarm · Aug 14, 2017 · 95f9661 · 95f9661
1 parent 3d2d944
commit 95f9661
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/core/linux-kirkwood-dt/0001-disable-mv643xx_eth-TSO.patch b/core/linux-kirkwood-dt/0001-disable-mv643xx_eth-TSO.patch
@@ -0,0 +1,25 @@
+From 311bb4a115f653ff9f3202873303483007906c8f Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 31 Aug 2014 08:45:13 -0600
+Subject: [PATCH] disable mv643xx_eth TSO
+
+---
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
+index b151a94..e04af62 100644
+--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
++++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
+@@ -3110,7 +3110,7 @@ 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;
+-- 
+1.9.0
+
diff --git a/core/linux-kirkwood-dt/PKGBUILD b/core/linux-kirkwood-dt/PKGBUILD
@@ -6,7 +6,7 @@ buildarch=2
 pkgbase=linux-kirkwood-dt
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood DT"
-pkgver=4.12.3
+pkgver=4.12.7
 srcver=${pkgver%.0}
 pkgrel=1
 arch=('arm')
@@ -19,12 +19,14 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
         'config'
         'archlinuxarm.patch'
         'fix_shortread_on_huge_media.patch'
+        '0001-disable-mv643xx_eth-TSO.patch'
         'goflexhome_fdt.patch'
         'linux.preset')
-md5sums=('3ed0cd86753ee668e1858e1e7f643066'
+md5sums=('245d1b4dc6e82669aac2c9e6a2dd82fe'
          '3b7795f77e839baf0137983cb5b74617'
          'a6c6f6d930d43787117d00fc759c115b'
          '79dd8cd94a574db6b2a024dec7c45a54'
+         '09d44b9f07abfaeaf4f688ee52034786'
          'f5a554eefbd337e71cca072e2d2cab45'
          '959e49540dac4c5e689ad9037150a360')
 
@@ -37,6 +39,8 @@ prepare() {
   # https://archlinuxarm.org/forum/viewtopic.php?f=15&t=11535&p=55350#p55350
   patch -Np1 -i "${srcdir}/fix_shortread_on_huge_media.patch"
 
+  patch -Np1 -i "${srcdir}/0001-disable-mv643xx_eth-TSO.patch"
+
   msg2 "Add Arch Linux ARM patch for ARMv5te plug computers"
   patch -Np1 -i "${srcdir}/archlinuxarm.patch"
   patch -Np1 -i "${srcdir}/goflexhome_fdt.patch"

diff --git a/core/linux-kirkwood-dt/linux-kirkwood-dt.install b/core/linux-kirkwood-dt/linux-kirkwood-dt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood-dt
-KERNEL_VERSION=4.12.0-1-ARCH
+KERNEL_VERSION=4.12.3-1-ARCH
 
 post_install () {
   # updating module dependencies