From 6523ee4682f482f4916eba0a40eff015fcbd1784 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 12 Jul 2013 07:47:24 -0400 Subject: [PATCH] Add iwlwifi fix for connection issue (rhbz 885407) --- ...nd-BT_CONFIG-on-devices-wo-Bluetooth.patch | 32 +++++++++++++++++++ kernel.spec | 11 ++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 iwlwifi-dvm-dont-send-BT_CONFIG-on-devices-wo-Bluetooth.patch diff --git a/iwlwifi-dvm-dont-send-BT_CONFIG-on-devices-wo-Bluetooth.patch b/iwlwifi-dvm-dont-send-BT_CONFIG-on-devices-wo-Bluetooth.patch new file mode 100644 index 000000000..fa4320763 --- /dev/null +++ b/iwlwifi-dvm-dont-send-BT_CONFIG-on-devices-wo-Bluetooth.patch @@ -0,0 +1,32 @@ +From 7b29fdb8cd8f92e31f550611a8c031986dba2e8f Mon Sep 17 00:00:00 2001 +From: Johannes Berg +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 +Signed-off-by: Johannes Berg +--- +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 diff --git a/kernel.spec b/kernel.spec index c8e34a789..b3d2ed26b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,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 101 +%global baserelease 102 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -786,6 +786,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 @@ -1522,6 +1525,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 @@ -2365,6 +2371,9 @@ fi # '-' | | # '-' %changelog +* Fri Jul 12 2013 Josh Boyer +- Add iwlwifi fix for connection issue (rhbz 885407) + * Sun Jul 7 2013 Peter Robinson - Fix building ARM kernel by dropping OMAP subpackage