Commit 8a4a0f3a authored by Eddie Wai's avatar Eddie Wai Committed by James Bottomley
Browse files

[SCSI] bnx2i: Added support for the 57712(E) devices 



Moved all PCI_DEVICE_ID_NX2_57712(E) definitions to pci_ids.h

Signed-off-by: default avatarEddie Wai <eddie.wai@broadcom.com>
Acked-by: default avatarMichael Chan <mchan@broadcom.com>
Acked-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent a977d2c9

drivers/net/bnx2x/bnx2x_main.c

+0 −7
Original line number Diff line number Diff line
@@ -145,13 +145,6 @@ static struct { 
	{ "Broadcom NetXtreme II BCM57712E XGb" }

};



#ifndef PCI_DEVICE_ID_NX2_57712

#define PCI_DEVICE_ID_NX2_57712		0x1662

#endif

#ifndef PCI_DEVICE_ID_NX2_57712E

#define PCI_DEVICE_ID_NX2_57712E	0x1663

#endif



static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {

	{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 },

	{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 },

drivers/scsi/bnx2i/bnx2i_init.c

+6 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static char version[] __devinitdata = 
MODULE_AUTHOR("Anil Veerabhadrappa <anilgv@broadcom.com> and "

	      "Eddie Wai <eddie.wai@broadcom.com>");



MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711"

MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711/57712"

		   " iSCSI Driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_MODULE_VERSION);
@@ -90,7 +90,9 @@ void bnx2i_identify_device(struct bnx2i_hba *hba) 
		hba->mail_queue_access = BNX2I_MQ_BIN_MODE;

	} else if (hba->pci_did == PCI_DEVICE_ID_NX2_57710  ||

		   hba->pci_did == PCI_DEVICE_ID_NX2_57711  ||

		   hba->pci_did == PCI_DEVICE_ID_NX2_57711E)

		   hba->pci_did == PCI_DEVICE_ID_NX2_57711E ||

		   hba->pci_did == PCI_DEVICE_ID_NX2_57712  ||

		   hba->pci_did == PCI_DEVICE_ID_NX2_57712E)

		set_bit(BNX2I_NX2_DEV_57710, &hba->cnic_dev_type);

	else

		printk(KERN_ALERT "bnx2i: unknown device, 0x%x\n",

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -2078,6 +2078,8 @@ 
#define PCI_DEVICE_ID_TIGON3_5723	0x165b

#define PCI_DEVICE_ID_TIGON3_5705M	0x165d

#define PCI_DEVICE_ID_TIGON3_5705M_2	0x165e

#define PCI_DEVICE_ID_NX2_57712		0x1662

#define PCI_DEVICE_ID_NX2_57712E	0x1663

#define PCI_DEVICE_ID_TIGON3_5714	0x1668

#define PCI_DEVICE_ID_TIGON3_5714S	0x1669

#define PCI_DEVICE_ID_TIGON3_5780	0x166a

CRA Git | Maintained and supported by SUSTech CRA and CCSE