Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70081ac5 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik
Browse files

[netdrvr] netxen: fix netxen_pci_tbl[] breakage 



	PCI_DEVICE_CLASS sets .device and .vendor to PCI_ANY_DEV,
which overrides the effect of preceding PCI_DEVICE() and makes
all elements of netxen_pci_tbl[] identical.  Introduced in the
commit dcd56fdb.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c5643cab

drivers/net/netxen/netxen_nic_main.c

+11 −7
Original line number Original line Diff line number Diff line
@@ -71,14 +71,18 @@ static irqreturn_t netxen_intr(int irq, void *data); 
static irqreturn_t netxen_msi_intr(int irq, void *data);

static irqreturn_t netxen_msi_intr(int irq, void *data);





/*  PCI Device ID Table  */

/*  PCI Device ID Table  */

#define ENTRY(device) \

	{PCI_DEVICE(0x4040, (device)), \

	.class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0}



static struct pci_device_id netxen_pci_tbl[] __devinitdata = {

static struct pci_device_id netxen_pci_tbl[] __devinitdata = {

	{PCI_DEVICE(0x4040, 0x0001), PCI_DEVICE_CLASS(0x020000, ~0)},

	ENTRY(0x0001),

	{PCI_DEVICE(0x4040, 0x0002), PCI_DEVICE_CLASS(0x020000, ~0)},

	ENTRY(0x0002),

	{PCI_DEVICE(0x4040, 0x0003), PCI_DEVICE_CLASS(0x020000, ~0)},

	ENTRY(0x0003),

	{PCI_DEVICE(0x4040, 0x0004), PCI_DEVICE_CLASS(0x020000, ~0)},

	ENTRY(0x0004),

	{PCI_DEVICE(0x4040, 0x0005), PCI_DEVICE_CLASS(0x020000, ~0)},

	ENTRY(0x0005),

	{PCI_DEVICE(0x4040, 0x0024), PCI_DEVICE_CLASS(0x020000, ~0)},

	ENTRY(0x0024),

	{PCI_DEVICE(0x4040, 0x0025), PCI_DEVICE_CLASS(0x020000, ~0)},

	ENTRY(0x0025),

	{0,}

	{0,}

};

};