* pull request: iwlwifi 2013 12 31
@ 2013-12-31 16:59 Emmanuel Grumbach
2013-12-31 17:00 ` [PATCH] iwlwifi: add new devices for 7265 series Emmanuel Grumbach
2014-01-06 19:20 ` pull request: iwlwifi 2013 12 31 John W. Linville
0 siblings, 2 replies; 3+ messages in thread
From: Emmanuel Grumbach @ 2013-12-31 16:59 UTC (permalink / raw)
To: John Linville, linux-wireless@vger.kernel.org; +Cc: ilw@linux.intel.com
[-- Attachment #1: Type: text/plain, Size: 935 bytes --]
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(-)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] iwlwifi: add new devices for 7265 series 2013-12-31 16:59 pull request: iwlwifi 2013 12 31 Emmanuel Grumbach @ 2013-12-31 17:00 ` Emmanuel Grumbach 2014-01-06 19:20 ` pull request: iwlwifi 2013 12 31 John W. Linville 1 sibling, 0 replies; 3+ messages in thread From: Emmanuel Grumbach @ 2013-12-31 17:00 UTC (permalink / raw) To: linux-wireless; +Cc: Oren Givon, Emmanuel Grumbach From: Oren Givon <oren.givon@intel.com> Add new device / subdevice ID for 7265 series. Fix 2 mistakes on the way. Signed-off-by: Oren Givon <oren.givon@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> --- drivers/net/wireless/iwlwifi/pcie/drv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index 8660502..e627254 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c @@ -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 */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: pull request: iwlwifi 2013 12 31 2013-12-31 16:59 pull request: iwlwifi 2013 12 31 Emmanuel Grumbach 2013-12-31 17:00 ` [PATCH] iwlwifi: add new devices for 7265 series Emmanuel Grumbach @ 2014-01-06 19:20 ` John W. Linville 1 sibling, 0 replies; 3+ messages in thread From: John W. Linville @ 2014-01-06 19:20 UTC (permalink / raw) To: Emmanuel Grumbach; +Cc: linux-wireless@vger.kernel.org, ilw@linux.intel.com On Tue, Dec 31, 2013 at 06:59:22PM +0200, Emmanuel Grumbach wrote: > 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) Pulling now... -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-06 19:30 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-12-31 16:59 pull request: iwlwifi 2013 12 31 Emmanuel Grumbach 2013-12-31 17:00 ` [PATCH] iwlwifi: add new devices for 7265 series Emmanuel Grumbach 2014-01-06 19:20 ` pull request: iwlwifi 2013 12 31 John W. Linville
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.