[openwrt/openwrt] mwlwifi: downgrade to version 10.3.4.0-20180118

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/0b8629c0e3c041ad71501a8bbd83ba924ef6e84e

commit 0b8629c0e3c041ad71501a8bbd83ba924ef6e84e
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Tue Feb 13 23:21:12 2018 +0100

    mwlwifi: downgrade to version 10.3.4.0-20180118
    
    Some people reported problems with the current development version, so
    go back to the latests more or less release.
    
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 package/kernel/mwlwifi/Makefile                    |  6 +--
 .../mwlwifi/patches/001-remove-vfs_write.patch     | 58 ++--------------------
 2 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
index 48de8da..5c3e86f 100644
--- a/package/kernel/mwlwifi/Makefile
+++ b/package/kernel/mwlwifi/Makefile
@@ -15,9 +15,9 @@ PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2018-02-08
-PKG_SOURCE_VERSION:=064e888e801d5e4c3638e92ee18a2cde06a6f2d0
-PKG_MIRROR_HASH:=9214ffcf43781c71a9d13baa0d515d8d3f64c5f853636b186b9633af286e443a
+PKG_SOURCE_DATE:=2018-01-18
+PKG_SOURCE_VERSION:=a149180fecec4fbaafb3f52ae46e33bd66501441
+PKG_MIRROR_HASH:=e5a791182208eea4602692e5453dc67bfe87f080b6f03b1c6d1657b546f93b31
 
 PKG_MAINTAINER:=Imre Kaloz <kaloz at openwrt.org>
 PKG_BUILD_PARALLEL:=1
diff --git a/package/kernel/mwlwifi/patches/001-remove-vfs_write.patch b/package/kernel/mwlwifi/patches/001-remove-vfs_write.patch
index 9703d1d..4945999 100644
--- a/package/kernel/mwlwifi/patches/001-remove-vfs_write.patch
+++ b/package/kernel/mwlwifi/patches/001-remove-vfs_write.patch
@@ -1,6 +1,6 @@
 --- a/debugfs.c
 +++ b/debugfs.c
-@@ -279,7 +279,6 @@ static void core_dump_file(u8 *valbuf, u
+@@ -87,7 +87,6 @@ static void core_dump_file(u8 *valbuf, u
  			   u32 append, u32 totallen, bool textmode)
  {
  	struct file *filp_core = NULL;
@@ -8,7 +8,7 @@
  	char file_name[40];
  	u8 *buf = kmalloc(length * 3, GFP_KERNEL);
  	u8 *data_p = buf;
-@@ -292,9 +291,6 @@ static void core_dump_file(u8 *valbuf, u
+@@ -100,9 +99,6 @@ static void core_dump_file(u8 *valbuf, u
  	sprintf(file_name, "/dev/shm/coredump-%x-%x",
  		region, (region + totallen));
  
@@ -18,7 +18,7 @@
  	if (append)
  		filp_core = filp_open(file_name, O_RDWR | O_APPEND, 0);
  	else
-@@ -317,15 +313,15 @@ static void core_dump_file(u8 *valbuf, u
+@@ -125,15 +121,15 @@ static void core_dump_file(u8 *valbuf, u
  			}
  			data_p = buf + j;
  			data_p += sprintf(data_p, "\n");
@@ -38,55 +38,3 @@
  	kfree(buf);
  }
  
-@@ -1338,7 +1334,6 @@ static ssize_t mwl_debugfs_ba_hist_read(
- 	u8 bmap0flag, nobaflag;
- 	char buff[500], file_location[20];
- 	struct file *filp_bahisto;
--	mm_segment_t oldfs;
- 	u8 *data_p = buff;
- 	ssize_t ret;
- 
-@@ -1354,13 +1349,10 @@ static ssize_t mwl_debugfs_ba_hist_read(
- 	memset(file_location, 0, sizeof(file_location));
- 	sprintf(file_location, "/tmp/ba_histo-%d", priv->ba_aid);
- 
--	oldfs = get_fs();
--	set_fs(KERNEL_DS);
- 	filp_bahisto = filp_open(file_location,
- 				 O_RDWR | O_CREAT | O_TRUNC, 0);
- 
- 	if (IS_ERR(filp_bahisto)) {
--		set_fs(oldfs);
- 		ret = -EIO;
- 		goto err;
- 	}
-@@ -1401,8 +1393,8 @@ static ssize_t mwl_debugfs_ba_hist_read(
- 
- 			/* Buffer is full. Write to file and reset buf */
- 			if ((strlen(buff) + 36) >= 500) {
--				vfs_write(filp_bahisto, buff, strlen(buff),
--					  &filp_bahisto->f_pos);
-+				kernel_write(filp_bahisto, buff, strlen(buff),
-+					     &filp_bahisto->f_pos);
- 				mdelay(2);
- 				memset(buff, 0, sizeof(buff));
- 				data_p = buff;
-@@ -1426,8 +1418,8 @@ static ssize_t mwl_debugfs_ba_hist_read(
- 				data_p += sprintf(data_p, "%8d\n", nobaflag);
- 		}
- 
--		vfs_write(filp_bahisto, buff, strlen(buff),
--			  &filp_bahisto->f_pos);
-+		kernel_write(filp_bahisto, buff, strlen(buff),
-+			     &filp_bahisto->f_pos);
- 		len += scnprintf(p + len, size - len,
- 				 "hole: %d, expect: %d, bmap0: %d, noba: %d\n",
- 				 baholecnt, baexpcnt, bmap0cnt, nobacnt);
-@@ -1440,7 +1432,6 @@ static ssize_t mwl_debugfs_ba_hist_read(
- 				 priv->ba_aid);
- 
- 	filp_close(filp_bahisto, current->files);
--	set_fs(oldfs);
- 
- 	ret = simple_read_from_buffer(ubuf, count, ppos, p, len);
-