Remove mwifiex patch.

3 files changed, 5 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6473a9f49d52..3daef638c673 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Fri Feb  3 15:17:49 UTC 2017
+# Sun Mar 26 22:06:12 UTC 2017
 pkgbase = linux-surface3-git
-	pkgver = 4.10rc2.r207.g88ba6ca
+	pkgver = 4.11rc3.r402.g0dc82fa59b9d
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = i686
@@ -22,7 +22,6 @@ pkgbase = linux-surface3-git
 	source = 0001-power-MSHW0011-rev-eng-implementation.patch
 	source = 0002-power-surface3_power-Improve-battery-capacity-report.patch
 	source = 0001-gpiolib-acpi-make-sure-we-trigger-the-events-at-leas.patch
-	source = mwifiex_11n_aggr.patch
 	sha256sums = SKIP
 	sha256sums = becc0c98cff692dee9500f19d38882636caf4c58d5086c7725690a245532f5dc
 	sha256sums = 2bf64f96aa977a996d2aaeeb249a266a7c6f83483d49a31a23e595cd895f0846
@@ -30,7 +29,6 @@ pkgbase = linux-surface3-git
 	sha256sums = 8fb00d96cb11ef3d9c250d6a5389c7eaf9f71d1259fb0a2cd210bf707adb8a71
 	sha256sums = 62eeb51c1ee81c2545fa0c1ac5a2b8f4a112ede4113095ce2ea4a66d07059734
 	sha256sums = abae4abc0495026b35b982b426207e7cbad4bf5314a1e706fa295c7f91886307
-	sha256sums = 6477d371ce0341404bcee0023fe2805667eed61bdf070755b9e9c4abb5433375
 
 pkgname = linux-surface3-git
 	pkgdesc = The Linux kernel and modules (git version)
diff --git a/PKGBUILD b/PKGBUILD
index 82d1df96f819..d61f70ef2287 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgbase=linux-surface3-git
 _srcname=linux
-pkgver=4.10rc2.r207.g88ba6ca
+pkgver=4.11rc3.r402.g0dc82fa59b9d
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -27,8 +27,6 @@ source=(
         "0001-power-MSHW0011-rev-eng-implementation.patch"
         "0002-power-surface3_power-Improve-battery-capacity-report.patch"
         "0001-gpiolib-acpi-make-sure-we-trigger-the-events-at-leas.patch"
-        # From https://bugzilla.kernel.org/show_bug.cgi?id=188351
-        "mwifiex_11n_aggr.patch"
         )
 sha256sums=('SKIP'
             'becc0c98cff692dee9500f19d38882636caf4c58d5086c7725690a245532f5dc'
@@ -36,8 +34,7 @@ sha256sums=('SKIP'
             '95fcfdfcb9d540d1a1428ce61e493ddf2c2a8ec96c8573deeadbb4ee407508c7'
             '8fb00d96cb11ef3d9c250d6a5389c7eaf9f71d1259fb0a2cd210bf707adb8a71'
             '62eeb51c1ee81c2545fa0c1ac5a2b8f4a112ede4113095ce2ea4a66d07059734'
-            'abae4abc0495026b35b982b426207e7cbad4bf5314a1e706fa295c7f91886307'
-            '6477d371ce0341404bcee0023fe2805667eed61bdf070755b9e9c4abb5433375')
+            'abae4abc0495026b35b982b426207e7cbad4bf5314a1e706fa295c7f91886307')
 
 _kernelname=${pkgbase#linux}
 
@@ -68,7 +65,6 @@ prepare() {
   patch -p1 < ${srcdir}/0001-power-MSHW0011-rev-eng-implementation.patch
   patch -p1 < ${srcdir}/0002-power-surface3_power-Improve-battery-capacity-report.patch
   patch -p1 < ${srcdir}/0001-gpiolib-acpi-make-sure-we-trigger-the-events-at-leas.patch
-  patch -p1 < ${srcdir}/mwifiex_11n_aggr.patch
 
   # load configuration
   # Configure the kernel. Replace the line below with one of your choice.
@@ -148,7 +144,7 @@ _package() {
   mv "${pkgdir}/lib" "${pkgdir}/usr/"
 
   # add vmlinux
-  install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux" 
+  install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux"
 
   # add System.map
   install -D -m644 System.map "${pkgdir}/boot/System.map-${_kernver}"
diff --git a/mwifiex_11n_aggr.patch b/mwifiex_11n_aggr.patch
deleted file mode 100644
index 5bf4cbad106b..000000000000
--- a/mwifiex_11n_aggr.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
-+++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
-@@ -190,7 +190,6 @@
-				       ra_list_flags);
-		return -1;
-	}
--	skb_reserve(skb_aggr, MWIFIEX_MIN_DATA_HEADER_LEN);
-	tx_info_aggr =  MWIFIEX_SKB_TXCB(skb_aggr);
-
-	memset(tx_info_aggr, 0, sizeof(*tx_info_aggr));