Removed 0001-linux-4.6-rtlwifi-fix-atomic.patch

3 files changed, 1 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc43e0ffa534..43490878479a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Jul 27 21:11:29 UTC 2016
+# Wed Jul 27 21:14:08 UTC 2016
 pkgbase = linux-bld
 	pkgver = 4.6.5
 	pkgrel = 1
@@ -28,7 +28,6 @@ pkgbase = linux-bld
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0004-blkck-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8-for-4.patch
 	source = https://raw.githubusercontent.com/rmullick/bld-patches/master/BLD-4.6.patch
-	source = 0001-linux-4.6-rtlwifi-fix-atomic.patch
 	sha256sums = a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866
 	sha256sums = SKIP
 	sha256sums = 857df33f085a0116b9d2322ffe3b23d5b7d8c4898427d79f68108a653e84910c
diff --git a/0001-linux-4.6-rtlwifi-fix-atomic.patch b/0001-linux-4.6-rtlwifi-fix-atomic.patch
deleted file mode 100644
index e514ec85f906..000000000000
--- a/0001-linux-4.6-rtlwifi-fix-atomic.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From de26859dcf363d520cc44e59f6dcaf20ebe0aadf Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Sat, 21 May 2016 11:50:35 -0500
-Subject: rtlwifi: Fix scheduling while atomic error from commit 49f86ec21c01
-
-Commit 49f86ec21c01 ("rtlwifi: Change long delays to sleeps") was correct
-for most cases; however, driver rtl8192ce calls the affected routines while
-in atomic context. The kernel bug output is as follows:
-
-BUG: scheduling while atomic: wpa_supplicant/627/0x00000002
-[...]
-  [<ffffffff815c2b39>] __schedule+0x899/0xad0
-  [<ffffffff815c2dac>] schedule+0x3c/0x90
-  [<ffffffff815c5bb2>] schedule_hrtimeout_range_clock+0xa2/0x120
-  [<ffffffff810e8b80>] ? hrtimer_init+0x120/0x120
-  [<ffffffff815c5ba6>] ? schedule_hrtimeout_range_clock+0x96/0x120
-  [<ffffffff815c5c43>] schedule_hrtimeout_range+0x13/0x20
-  [<ffffffff815c568f>] usleep_range+0x4f/0x70
-  [<ffffffffa0667218>] rtl_rfreg_delay+0x38/0x50 [rtlwifi]
-  [<ffffffffa06dd0e7>] rtl92c_phy_config_rf_with_headerfile+0xc7/0xe0 [rtl8192ce]
-
-To fix this bug, three of the changes from delay to sleep are reverted.
-Unfortunately, one of the changes involves a delay of 50 msec. The calling
-code will be modified so that this long delay can be avoided; however,
-this change is being pushed now to fix the problem in kernel 4.6.0.
-
-Fixes: 49f86ec21c01 ("rtlwifi: Change long delays to sleeps")
-Reported-by: James Feeney <james@nurealm.net>
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-Cc: James Feeney <james@nurealm.net>
-Cc: Stable <stable@vger.kernel.org> [4.6+]
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/net/wireless/realtek/rtlwifi/core.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
-index 0f48048..3a0faa8 100644
---- a/drivers/net/wireless/realtek/rtlwifi/core.c
-+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
-@@ -54,7 +54,7 @@ EXPORT_SYMBOL(channel5g_80m);
- void rtl_addr_delay(u32 addr)
- {
- 	if (addr == 0xfe)
--		msleep(50);
-+		mdelay(50);
- 	else if (addr == 0xfd)
- 		msleep(5);
- 	else if (addr == 0xfc)
-@@ -75,7 +75,7 @@ void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
- 		rtl_addr_delay(addr);
- 	} else {
- 		rtl_set_rfreg(hw, rfpath, addr, mask, data);
--		usleep_range(1, 2);
-+		udelay(1);
- 	}
- }
- EXPORT_SYMBOL(rtl_rfreg_delay);
-@@ -86,7 +86,7 @@ void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data)
- 		rtl_addr_delay(addr);
- 	} else {
- 		rtl_set_bbreg(hw, addr, MASKDWORD, data);
--		usleep_range(1, 2);
-+		udelay(1);
- 	}
- }
- EXPORT_SYMBOL(rtl_bb_delay);
--- 
-cgit v0.12
-
diff --git a/PKGBUILD b/PKGBUILD
index 894650b6db7f..3c328dbb5c65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,7 +33,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         "${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfqversion_old}-for.patch"
         "${_bfqpath}/0004-blkck-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-${_bfqversion}-for-4.patch"
         "https://raw.githubusercontent.com/rmullick/bld-patches/master/${_BLDpatch}"
-        "0001-linux-4.6-rtlwifi-fix-atomic.patch"
         )
 
 sha256sums=('a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866'
@@ -89,10 +88,6 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # fix rtlwifi atomic
-  # https://bugs.archlinux.org/task/49401
-  patch -p1 -i "${srcdir}/0001-linux-4.6-rtlwifi-fix-atomic.patch"
-
   msg2 "BLD patches"
   patch -Np1 -i "${srcdir}/${_BLDpatch}"