3.14-stable patches

added patches:
	iwlwifi-update-and-fix-7265-series-pci-ids.patch

diff --git a/queue-3.14/iwlwifi-update-and-fix-7265-series-pci-ids.patch b/queue-3.14/iwlwifi-update-and-fix-7265-series-pci-ids.patch
new file mode 100644 (file)
index 0000000..62945f8
--- /dev/null
+++ b/queue-3.14/iwlwifi-update-and-fix-7265-series-pci-ids.patch
@@ -0,0 +1,42 @@
+From 006bda75d81fd27a583a3b310e9444fea2aa6ef2 Mon Sep 17 00:00:00 2001
+From: Oren Givon <oren.givon@intel.com>
+Date: Thu, 17 Dec 2015 14:17:00 +0200
+Subject: iwlwifi: update and fix 7265 series PCI IDs
+
+From: Oren Givon <oren.givon@intel.com>
+
+commit 006bda75d81fd27a583a3b310e9444fea2aa6ef2 upstream.
+
+Update and fix some 7265 PCI IDs entries.
+
+Signed-off-by: Oren Givon <oren.givon@intel.com>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/iwlwifi/pcie/drv.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
++++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
+@@ -367,6 +367,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_ca
+       {IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_n_cfg)},
+       {IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x095A, 0x5C10, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x5412, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},
+@@ -383,10 +384,10 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_ca
+       {IWL_PCI_DEVICE(0x095A, 0x9012, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x9112, iwl7265_2ac_cfg)},
+-      {IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x095B, 0x9210, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095B, 0x9200, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)},
+-      {IWL_PCI_DEVICE(0x095A, 0x9310, iwl7265_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x095B, 0x9310, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)},
+       {IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)},

diff --git a/queue-3.14/series b/queue-3.14/series
index 41e039b91e1f73a9baaa690a737f48583294a046..085fedf7e433413c0da3957f930b6a8311a69dcc 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -127,3 +127,4 @@ sunrpc-cache-fix-off-by-one-in-qword_get.patch
 kernel-resource.c-fix-muxed-resource-handling-in-__request_region.patch
 do_last-don-t-let-a-bogus-return-value-from-open-et.al.-to-confuse-us.patch
 xen-pcifront-fix-mysterious-crashes-when-numa-locality-information-was-extracted.patch
+iwlwifi-update-and-fix-7265-series-pci-ids.patch