diff mbox

[dpdk-dev,v2] kni: fix build with kernel 4.8

Message ID 1473359529-21538-1-git-send-email-ferruh.yigit@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Commit Message

Ferruh Yigit Sept. 8, 2016, 6:32 p.m. UTC 
  Linux kernel v4.8 removes macro DEFINE_PCI_DEVICE_TABLE

Linux: 7e9321599011 ("treewide: remove references to the now unnecessary
DEFINE_PCI_DEVICE_TABLE")

Replaced macro with its value in kni ethtool drivers.

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c     | 2 +-
 lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

De Lara Guarch, Pablo Sept. 9, 2016, 10:33 p.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Ferruh Yigit
> Sent: Thursday, September 08, 2016 11:32 AM
> To: dev@dpdk.org
> Cc: Stephen Hemminger
> Subject: [dpdk-dev] [PATCH v2] kni: fix build with kernel 4.8
> 
> Linux kernel v4.8 removes macro DEFINE_PCI_DEVICE_TABLE
> 
> Linux: 7e9321599011 ("treewide: remove references to the now unnecessary
> DEFINE_PCI_DEVICE_TABLE")
> 
> Replaced macro with its value in kni ethtool drivers.
> 
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Christian Ehrhardt Sept. 19, 2016, 12:21 p.m. UTC | #2 
On Thu, Sep 8, 2016 at 8:32 PM, Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> Linux kernel v4.8 removes macro DEFINE_PCI_DEVICE_TABLE
>
> Linux: 7e9321599011 ("treewide: remove references to the now unnecessary
> DEFINE_PCI_DEVICE_TABLE")
>
> Replaced macro with its value in kni ethtool drivers.


Just ran into the same and thereby had the unplanned chance to review and
test.
Works fine, thanks Ferruh

Acked-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Stephen Hemminger Sept. 20, 2016, 7:03 p.m. UTC | #3 
On Thu,  8 Sep 2016 19:32:09 +0100
Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> Linux kernel v4.8 removes macro DEFINE_PCI_DEVICE_TABLE
> 
> Linux: 7e9321599011 ("treewide: remove references to the now unnecessary
> DEFINE_PCI_DEVICE_TABLE")
> 
> Replaced macro with its value in kni ethtool drivers.
> 
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

Why is this not already applied? There are two ack and it has been 12 days
since initial posting!

Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Thomas Monjalon Sept. 21, 2016, 4:17 p.m. UTC | #4 
2016-09-09 22:33, De Lara Guarch, Pablo:
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Ferruh Yigit
> > Linux kernel v4.8 removes macro DEFINE_PCI_DEVICE_TABLE
> > 
> > Linux: 7e9321599011 ("treewide: remove references to the now unnecessary
> > DEFINE_PCI_DEVICE_TABLE")
> > 
> > Replaced macro with its value in kni ethtool drivers.
> > 
> > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied, thanks
diff mbox

Patch

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
index 3dd103c..1bb2242 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
@@ -76,7 +76,7 @@  static const char igb_driver_string[] =
 static const char igb_copyright[] =
 				"Copyright (c) 2007-2013 Intel Corporation.";
 
-DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
+const struct pci_device_id igb_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) },
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
index 0d82613..d26016c 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
@@ -86,7 +86,7 @@  const char ixgbe_driver_version[] = DRV_VERSION;
  * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
  *   Class, Class Mask, private data (not used) }
  */
-DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = {
+const struct pci_device_id ixgbe_pci_tbl[] = {
 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598)},
 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT)},
 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT)},