delete queue-3.18/wlcore-fix-64k-page-support.patch

it broke the build

diff --git a/queue-3.18/series b/queue-3.18/series
index 6b370aa04836e02f590aec712dd55515ff405232..1f73e9e9b0b556b6ac7e42a6befb8efefe566874 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -12,7 +12,6 @@ include-stddef.h-move-offsetofend-from-vfio.h-to-a-generic-kernel-header.patch
 stddef.h-move-offsetofend-inside-ifndef-endif-guard-neaten.patch
 nfc-add-sockaddr-length-checks-before-accessing-sa_family-in-bind-handlers.patch
 bluetooth-use-constant-time-memory-comparison-for-secret-values.patch
-wlcore-fix-64k-page-support.patch
 asoc-compress-derive-substream-from-stream-based-on-direction.patch
 pm-domains-fix-unsafe-iteration-over-modified-list-of-device-links.patch
 pm-domains-fix-unsafe-iteration-over-modified-list-of-domain-providers.patch

diff --git a/queue-3.18/wlcore-fix-64k-page-support.patch b/queue-3.18/wlcore-fix-64k-page-support.patch
deleted file mode 100644 (file)
index c343e71..0000000
--- a/queue-3.18/wlcore-fix-64k-page-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4a4274bf2dbbd1c7a45be0c89a1687c9d2eef4a0 Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Thu, 11 May 2017 13:52:09 +0200
-Subject: wlcore: fix 64K page support
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-commit 4a4274bf2dbbd1c7a45be0c89a1687c9d2eef4a0 upstream.
-
-In the stable linux-3.16 branch, I ran into a warning in the
-wlcore driver:
-
-drivers/net/wireless/ti/wlcore/spi.c: In function 'wl12xx_spi_raw_write':
-drivers/net/wireless/ti/wlcore/spi.c:315:1: error: the frame size of 12848 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
-
-Newer kernels no longer show the warning, but the bug is still there,
-as the allocation is based on the CPU page size rather than the
-actual capabilities of the hardware.
-
-This replaces the PAGE_SIZE macro with the SZ_4K macro, i.e. 4096 bytes
-per buffer.
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/wireless/ti/wlcore/spi.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/ti/wlcore/spi.c
-+++ b/drivers/net/wireless/ti/wlcore/spi.c
-@@ -71,7 +71,7 @@
-  * only support SPI for 12xx - this code should be reworked when 18xx
-  * support is introduced
-  */
--#define SPI_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
-+#define SPI_AGGR_BUFFER_SIZE (4 * SZ_4K)
- 
- /* Maximum number of SPI write chunks */
- #define WSPI_MAX_NUM_OF_CHUNKS \