Add iwlwifi fix for connection issue (rhbz 885407)
This commit is contained in:
parent
b9f0d980bc
commit
6c78bc0a35
|
@ -0,0 +1,32 @@
|
|||
From 7b29fdb8cd8f92e31f550611a8c031986dba2e8f Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Fri, 03 May 2013 16:58:16 +0000
|
||||
Subject: iwlwifi: dvm: don't send BT_CONFIG on devices w/o Bluetooth
|
||||
|
||||
The BT_CONFIG command that is sent to the device during
|
||||
startup will enable BT coex unless the module parameter
|
||||
turns it off, but on devices without Bluetooth this may
|
||||
cause problems, as reported in Redhat BZ 885407.
|
||||
|
||||
Fix this by sending the BT_CONFIG command only when the
|
||||
device has Bluetooth.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
||||
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
|
||||
---
|
||||
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
|
||||
index 3952ddf..1531a4f 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
|
||||
@@ -758,7 +758,7 @@ int iwl_alive_start(struct iwl_priv *priv)
|
||||
BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
|
||||
if (ret)
|
||||
return ret;
|
||||
- } else {
|
||||
+ } else if (priv->lib->bt_params) {
|
||||
/*
|
||||
* default is 2-wire BT coexexistence support
|
||||
*/
|
||||
--
|
||||
cgit v0.9.2
|
11
kernel.spec
11
kernel.spec
|
@ -62,7 +62,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 201
|
||||
%global baserelease 202
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -808,6 +808,9 @@ Patch25062: vhost-net-fix-use-after-free-in-vhost_net_flush.patch
|
|||
#rhbz 959721
|
||||
Patch25063: HID-kye-Add-report-fixup-for-Genius-Gila-Gaming-mouse.patch
|
||||
|
||||
#rhbz 885407
|
||||
Patch25064: iwlwifi-dvm-dont-send-BT_CONFIG-on-devices-wo-Bluetooth.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
@ -1553,6 +1556,9 @@ ApplyPatch vhost-net-fix-use-after-free-in-vhost_net_flush.patch
|
|||
#rhbz 959721
|
||||
ApplyPatch HID-kye-Add-report-fixup-for-Genius-Gila-Gaming-mouse.patch
|
||||
|
||||
#rhbz 885407
|
||||
ApplyPatch iwlwifi-dvm-dont-send-BT_CONFIG-on-devices-wo-Bluetooth.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
@ -2398,6 +2404,9 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Fri Jul 12 2013 Josh Boyer <jwboyer@redhat.com>
|
||||
- Add iwlwifi fix for connection issue (rhbz 885407)
|
||||
|
||||
* Fri Jul 05 2013 Josh Boyer <jwboyer@redhat.com>
|
||||
- Add report fixup for Genius Gila mouse from Benjamin Tissoires (rhbz 959721)
|
||||
- Add vhost-net use-after-free fix (rhbz 976789 980643)
|
||||
|
|
Loading…
Reference in New Issue