diff --git a/srcpkgs/linux4.6/patches/0001-rtlwifi-Fix-scheduling-while-atomic-error-from-commi.patch b/srcpkgs/linux4.6/patches/0001-rtlwifi-Fix-scheduling-while-atomic-error-from-commi.patch deleted file mode 100644 index a10476c8a98..00000000000 --- a/srcpkgs/linux4.6/patches/0001-rtlwifi-Fix-scheduling-while-atomic-error-from-commi.patch +++ /dev/null @@ -1,71 +0,0 @@ -From de26859dcf363d520cc44e59f6dcaf20ebe0aadf Mon Sep 17 00:00:00 2001 -From: Larry Finger -Date: Sat, 21 May 2016 11:50:35 -0500 -Subject: [PATCH] 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 -[...] - [] __schedule+0x899/0xad0 - [] schedule+0x3c/0x90 - [] schedule_hrtimeout_range_clock+0xa2/0x120 - [] ? hrtimer_init+0x120/0x120 - [] ? schedule_hrtimeout_range_clock+0x96/0x120 - [] schedule_hrtimeout_range+0x13/0x20 - [] usleep_range+0x4f/0x70 - [] rtl_rfreg_delay+0x38/0x50 [rtlwifi] - [] 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 -Signed-off-by: Larry Finger -Cc: James Feeney -Cc: Stable [4.6+] -Signed-off-by: Kalle Valo ---- - drivers/net/wireless/realtek/rtlwifi/core.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git drivers/net/wireless/realtek/rtlwifi/core.c drivers/net/wireless/realtek/rtlwifi/core.c -index 0f48048..3a0faa8 100644 ---- drivers/net/wireless/realtek/rtlwifi/core.c -+++ 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); --- -2.8.4 - diff --git a/srcpkgs/linux4.6/template b/srcpkgs/linux4.6/template index d16405aa3c9..b6e3ee688ef 100644 --- a/srcpkgs/linux4.6/template +++ b/srcpkgs/linux4.6/template @@ -1,6 +1,6 @@ # Template file for 'linux4.6' pkgname=linux4.6 -version=4.6.4 +version=4.6.5 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " @@ -8,7 +8,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=8568d41c7104e941989b14a380d167129f83db42c04e950d8d9337fe6012ff7e +checksum=7e2d53c8a36a159c444be8f452eae898fadc1f1862fe470a36c836c3d1d613c5 nocross=yes nodebug=yes