Message ID | 20160303205737.6701.97855.stgit@bwallan-cwp1.jf.intel.com |
---|---|
State | Changes Requested |
Delegated to: | Jeff Kirsher |
Headers | show |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On > Behalf Of Bruce Allan > Sent: Thursday, March 03, 2016 12:58 PM > To: intel-wired-lan@lists.osuosl.org > Subject: [Intel-wired-lan] [next-queue PATCH] fm10k: enable Intel Ethernet > SDI Adapter FM10420 device ids > > Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> > --- > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 ++ > drivers/net/ethernet/intel/fm10k/fm10k_type.h | 2 ++ > 2 files changed, 4 insertions(+) Jeff, please drop this patch from your tree.
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On > Behalf Of Allan, Bruce W > Sent: Thursday, March 17, 2016 10:44 AM > To: Allan, Bruce W <bruce.w.allan@intel.com>; intel-wired- > lan@lists.osuosl.org > Subject: Re: [Intel-wired-lan] [next-queue PATCH] fm10k: enable Intel > Ethernet SDI Adapter FM10420 device ids > > > -----Original Message----- > > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] > On > > Behalf Of Bruce Allan > > Sent: Thursday, March 03, 2016 12:58 PM > > To: intel-wired-lan@lists.osuosl.org > > Subject: [Intel-wired-lan] [next-queue PATCH] fm10k: enable Intel > Ethernet > > SDI Adapter FM10420 device ids > > > > Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> > > --- > > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 ++ > > drivers/net/ethernet/intel/fm10k/fm10k_type.h | 2 ++ > > 2 files changed, 4 insertions(+) > > Jeff, please drop this patch from your tree. > Hi Jeff, I just confirmed this morning that the patch hasn't been dropped from your tree, so this is a friendly ping to remind you. Thanks, Jake
On Thu, 2016-03-24 at 16:27 +0000, Keller, Jacob E wrote: > > -----Original Message----- > > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl. > org] On > > Behalf Of Allan, Bruce W > > Sent: Thursday, March 17, 2016 10:44 AM > > To: Allan, Bruce W <bruce.w.allan@intel.com>; intel-wired- > > lan@lists.osuosl.org > > Subject: Re: [Intel-wired-lan] [next-queue PATCH] fm10k: enable > Intel > > Ethernet SDI Adapter FM10420 device ids > > > > > -----Original Message----- > > > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuos > l.org] > > On > > > Behalf Of Bruce Allan > > > Sent: Thursday, March 03, 2016 12:58 PM > > > To: intel-wired-lan@lists.osuosl.org > > > Subject: [Intel-wired-lan] [next-queue PATCH] fm10k: enable Intel > > Ethernet > > > SDI Adapter FM10420 device ids > > > > > > Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> > > > --- > > > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 ++ > > > drivers/net/ethernet/intel/fm10k/fm10k_type.h | 2 ++ > > > 2 files changed, 4 insertions(+) > > > > Jeff, please drop this patch from your tree. > > > > Hi Jeff, > > I just confirmed this morning that the patch hasn't been dropped from > your tree, so this is a friendly ping to remind you. Done.
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c index 5b74eac..c3b9945 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c @@ -39,6 +39,8 @@ static const struct fm10k_info *fm10k_info_tbl[] = { */ static const struct pci_device_id fm10k_pci_tbl[] = { { PCI_VDEVICE(INTEL, FM10K_DEV_ID_PF), fm10k_device_pf }, + { PCI_VDEVICE(INTEL, FM10K_DEV_ID_SDI_FM10420_QDA2), fm10k_device_pf }, + { PCI_VDEVICE(INTEL, FM10K_DEV_ID_SDI_FM10420_DA2), fm10k_device_pf }, { PCI_VDEVICE(INTEL, FM10K_DEV_ID_VF), fm10k_device_vf }, /* required last entry */ { 0, } diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_type.h b/drivers/net/ethernet/intel/fm10k/fm10k_type.h index 5c05330..e24515f 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_type.h +++ b/drivers/net/ethernet/intel/fm10k/fm10k_type.h @@ -32,6 +32,8 @@ struct fm10k_hw; #define FM10K_DEV_ID_PF 0x15A4 #define FM10K_DEV_ID_VF 0x15A5 +#define FM10K_DEV_ID_SDI_FM10420_QDA2 0x15D0 +#define FM10K_DEV_ID_SDI_FM10420_DA2 0x15D5 #define FM10K_MAX_QUEUES 256 #define FM10K_MAX_QUEUES_PF 128
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> --- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 ++ drivers/net/ethernet/intel/fm10k/fm10k_type.h | 2 ++ 2 files changed, 4 insertions(+)