pull request: iwlwifi 2013 12 31

PATCH New Emmanuel Grumbach 2 participants 3 messages Dec 31, 2013 – Jan 6, 2014 Networking drivers (wireless)

Share & tools

Emmanuel Grumbach

author

2013-12-31 16:59 UTC #0 lore raw

Hi John,

This is a pull request intended for 3.13.
It only includes new device IDs so it's not vital. If you have a pull request to net.git anyway, I'd happy to have this in. If not, I'll CC stable later.

Thanks!

The following changes since commit 3c5da7eefce5835acfc73ebd0a4f961cdae4ae67:

iwlwifi: mvm: use a cast to calculate the last seqno from the next one
(2013-11-25 23:00:21 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git
for=john

for you to fetch changes up to efc5520c4224479967b7381775a63fb48283b082:

iwlwifi: add new devices for 7265 series (2013-12-31 17:32:20 +0200)

----------------------------------------------------------------
Oren Givon (1):
iwlwifi: add new devices for 7265 series

 drivers/net/wireless/iwlwifi/pcie/drv.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Emmanuel Grumbach

author

2013-12-31 17:01 UTC #1 lore raw

PATCH 1/1 iwlwifi: add new devices for 7265 series

From: Oren Givon <[email protected]>

Add new device / subdevice ID for 7265 series. Fix 2 mistakes on the way.

Signed-off-by Oren Givon <[email protected]>

Reviewed-by Johannes Berg <[email protected]>

Signed-off-by Emmanuel Grumbach <[email protected]>

---
 drivers/net/wireless/iwlwifi/pcie/drv.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

drivers/net/wireless/iwlwifi/pcie/drv.c +8 -2

index 8660502..e627254 100644
@@ -357,21 +357,27 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
 	{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},
-	{IWL_PCI_DEVICE(0x095B, 0x5012, iwl7265_2ac_cfg)},
-	{IWL_PCI_DEVICE(0x095B, 0x500A, iwl7265_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x095A, 0x500A, iwl7265_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)},
 	{IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)},
 	{IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)},
 	{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},
 	{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x095A, 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)},
 	{IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)},
 	{IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x095A, 0x5190, iwl7265_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)},
 #endif /* CONFIG_IWLMVM */

Signature · 1 line

1.7.9.5

John W. Linville

2014-01-06 19:30 UTC #2 lore raw

In reply to Emmanuel Grumbach

Quoted 17 lines · Emmanuel Grumbach

Hi John,
This is a pull request intended for 3.13.
It only includes new device IDs so it's not vital. If you have a pull request to net.git anyway, I'd happy to have this in. If not, I'll CC stable later.
Thanks!
The following changes since commit 3c5da7eefce5835acfc73ebd0a4f961cdae4ae67:
iwlwifi: mvm: use a cast to calculate the last seqno from the next one
(2013-11-25 23:00:21 +0200)
are available in the git repository at:

Quoted 6 lines

git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git
for=john
for you to fetch changes up to efc5520c4224479967b7381775a63fb48283b082:
iwlwifi: add new devices for 7265 series (2013-12-31 17:32:20 +0200)

Pulling now...

Signature · 2 lines

John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.