]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
projects / thirdparty / kernel / stable-queue.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e690ad4)
3.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Nov 2013 16:53:44 +0000 (08:53 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Nov 2013 16:53:44 +0000 (08:53 -0800)
added patches:
iwlwifi-add-new-7260-and-3160-series-device-ids.patch
iwlwifi-pcie-add-new-skus-for-7000-3160-nic-series.patch

queue-3.10/iwlwifi-add-new-7260-and-3160-series-device-ids.patch [new file with mode: 0644] patch | blob
queue-3.10/iwlwifi-pcie-add-new-skus-for-7000-3160-nic-series.patch [new file with mode: 0644] patch | blob
queue-3.10/series patch | blob | blame | history

diff --git a/queue-3.10/iwlwifi-add-new-7260-and-3160-series-device-ids.patch b/queue-3.10/iwlwifi-add-new-7260-and-3160-series-device-ids.patch
new file mode 100644 (file)
index 0000000..2d776b6
--- /dev/null
+++ b/queue-3.10/iwlwifi-add-new-7260-and-3160-series-device-ids.patch
@@ -0,0 +1,154 @@
+From 93fc64114b994f9ef6901697f9b0de00762680e9 Mon Sep 17 00:00:00 2001
+From: Oren Givon <oren.givon@intel.com>
+Date: Tue, 23 Apr 2013 18:19:11 +0300
+Subject: iwlwifi: add new 7260 and 3160 series device IDs
+
+From: Oren Givon <oren.givon@intel.com>
+
+commit 93fc64114b994f9ef6901697f9b0de00762680e9 upstream.
+
+Add new device IDs and configurations to support
+all the devices.
+
+Signed-off-by: Oren Givon <oren.givon@intel.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/iwlwifi/iwl-7000.c   |   42 +++++++++++++++++++++++--
+ drivers/net/wireless/iwlwifi/iwl-config.h |    6 +++
+ drivers/net/wireless/iwlwifi/pcie/drv.c   |   50 ++++++++++++++++++++++++++++--
+ 3 files changed, 91 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
++++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
+@@ -125,7 +125,7 @@ static const struct iwl_ht_params iwl700
+ 
+ 
+ const struct iwl_cfg iwl7260_2ac_cfg = {
+-      .name = "Intel(R) Dual Band Wireless AC7260",
++      .name = "Intel(R) Dual Band Wireless AC 7260",
+       .fw_name_pre = IWL7260_FW_PRE,
+       IWL_DEVICE_7000,
+       .ht_params = &iwl7000_ht_params,
+@@ -133,8 +133,44 @@ const struct iwl_cfg iwl7260_2ac_cfg = {
+       .nvm_calib_ver = IWL7260_TX_POWER_VERSION,
+ };
+ 
+-const struct iwl_cfg iwl3160_ac_cfg = {
+-      .name = "Intel(R) Dual Band Wireless AC3160",
++const struct iwl_cfg iwl7260_2n_cfg = {
++      .name = "Intel(R) Dual Band Wireless N 7260",
++      .fw_name_pre = IWL7260_FW_PRE,
++      IWL_DEVICE_7000,
++      .ht_params = &iwl7000_ht_params,
++      .nvm_ver = IWL7260_NVM_VERSION,
++      .nvm_calib_ver = IWL7260_TX_POWER_VERSION,
++};
++
++const struct iwl_cfg iwl7260_n_cfg = {
++      .name = "Intel(R) Wireless N 7260",
++      .fw_name_pre = IWL7260_FW_PRE,
++      IWL_DEVICE_7000,
++      .ht_params = &iwl7000_ht_params,
++      .nvm_ver = IWL7260_NVM_VERSION,
++      .nvm_calib_ver = IWL7260_TX_POWER_VERSION,
++};
++
++const struct iwl_cfg iwl3160_2ac_cfg = {
++      .name = "Intel(R) Dual Band Wireless AC 3160",
++      .fw_name_pre = IWL3160_FW_PRE,
++      IWL_DEVICE_7000,
++      .ht_params = &iwl7000_ht_params,
++      .nvm_ver = IWL3160_NVM_VERSION,
++      .nvm_calib_ver = IWL3160_TX_POWER_VERSION,
++};
++
++const struct iwl_cfg iwl3160_2n_cfg = {
++      .name = "Intel(R) Dual Band Wireless N 3160",
++      .fw_name_pre = IWL3160_FW_PRE,
++      IWL_DEVICE_7000,
++      .ht_params = &iwl7000_ht_params,
++      .nvm_ver = IWL3160_NVM_VERSION,
++      .nvm_calib_ver = IWL3160_TX_POWER_VERSION,
++};
++
++const struct iwl_cfg iwl3160_n_cfg = {
++      .name = "Intel(R) Wireless N 3160",
+       .fw_name_pre = IWL3160_FW_PRE,
+       IWL_DEVICE_7000,
+       .ht_params = &iwl7000_ht_params,
+--- a/drivers/net/wireless/iwlwifi/iwl-config.h
++++ b/drivers/net/wireless/iwlwifi/iwl-config.h
+@@ -321,6 +321,10 @@ extern const struct iwl_cfg iwl105_bgn_c
+ extern const struct iwl_cfg iwl105_bgn_d_cfg;
+ extern const struct iwl_cfg iwl135_bgn_cfg;
+ extern const struct iwl_cfg iwl7260_2ac_cfg;
+-extern const struct iwl_cfg iwl3160_ac_cfg;
++extern const struct iwl_cfg iwl7260_2n_cfg;
++extern const struct iwl_cfg iwl7260_n_cfg;
++extern const struct iwl_cfg iwl3160_2ac_cfg;
++extern const struct iwl_cfg iwl3160_2n_cfg;
++extern const struct iwl_cfg iwl3160_n_cfg;
+ 
+ #endif /* __IWL_CONFIG_H__ */
+--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
++++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
+@@ -267,10 +267,54 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_ca
+ 
+ /* 7000 Series */
+       {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
+-      {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)},
+-      {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_ac_cfg)},
+-      {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)},
++
++/* 3160 Series */
++      {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
+ 
+       {0}
+ };
diff --git a/queue-3.10/iwlwifi-pcie-add-new-skus-for-7000-3160-nic-series.patch b/queue-3.10/iwlwifi-pcie-add-new-skus-for-7000-3160-nic-series.patch
new file mode 100644 (file)
index 0000000..16b5f1b
--- /dev/null
+++ b/queue-3.10/iwlwifi-pcie-add-new-skus-for-7000-3160-nic-series.patch
@@ -0,0 +1,109 @@
+From b49926629fb5c324bb1ed3960fb0d7905a4a8562 Mon Sep 17 00:00:00 2001
+From: Matti Gottlieb <matti.gottlieb@intel.com>
+Date: Sun, 22 Sep 2013 08:23:23 +0300
+Subject: iwlwifi: pcie: add new SKUs for 7000 & 3160 NIC series
+
+From: Matti Gottlieb <matti.gottlieb@intel.com>
+
+commit b49926629fb5c324bb1ed3960fb0d7905a4a8562 upstream.
+
+Add some new PCI IDs to the table for 7000 & 3160 series
+
+Signed-off-by: Matti Gottlieb <matti.gottlieb@intel.com>
+Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Johannes Berg <johannes.berg@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 |   35 +++++++++++++++++++++++++++++---
+ 1 file changed, 32 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
++++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
+@@ -267,54 +267,83 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_ca
+ 
+ /* 7000 Series */
+       {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0x4272, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0x426A, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4472, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x446A, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)},
+-      {IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg)},
+-      {IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg)},
+-      {IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4570, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x4560, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0x4370, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0x4360, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x5070, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0x402A, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC072, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC06A, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7260_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC472, iwl7260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC570, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC560, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B2, 0xC370, iwl7260_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC360, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)},
++      {IWL_PCI_DEVICE(0x08B1, 0xC02A, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)},
+ 
+ /* 3160 Series */
+       {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x0072, iwl3160_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x0172, iwl3160_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B4, 0x0272, iwl3160_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x0472, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B4, 0x0370, iwl3160_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x8072, iwl3160_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x8172, iwl3160_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
+       {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
++      {IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)},
+ 
+       {0}
+ };
diff --git a/queue-3.10/series b/queue-3.10/series
index 834a37f1bcce1c8c831009d09de10c5b7e10330c..18c3b5fc702be128e90cc915b1545e6aa9d98739 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -14,3 +14,5 @@ usb-add-new-zte-3g-dongle-s-pid-to-option.c.patch
 alsa-hda-hdmi-fix-reported-channel-map-on-common-default-layouts.patch
 tracing-fix-potential-out-of-bounds-in-trace_get_user.patch
 perf-fix-perf-ring-buffer-memory-ordering.patch
+iwlwifi-add-new-7260-and-3160-series-device-ids.patch
+iwlwifi-pcie-add-new-skus-for-7000-3160-nic-series.patch
Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git