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

Commit 76b73530 authored by Padmanabh Ratnakar's avatar Padmanabh Ratnakar Committed by David S. Miller
Browse files

be2net: Fix skyhawk VF PCI Device ID 



Signed-off-by: default avatarPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 773a2d7c

drivers/net/ethernet/emulex/benet/be.h

+4 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define OC_DEVICE_ID3		0xe220	/* Device id for Lancer cards */

#define OC_DEVICE_ID4           0xe228   /* Device id for VF in Lancer */

#define OC_DEVICE_ID5		0x720	/* Device Id for Skyhawk cards */

#define OC_DEVICE_ID6		0x728   /* Device id for VF in SkyHawk */

#define OC_SUBSYS_DEVICE_ID1	0xE602

#define OC_SUBSYS_DEVICE_ID2	0xE642

#define OC_SUBSYS_DEVICE_ID3	0xE612
@@ -71,6 +72,7 @@ static inline char *nic_name(struct pci_dev *pdev) 
	case BE_DEVICE_ID2:

		return BE3_NAME;

	case OC_DEVICE_ID5:

	case OC_DEVICE_ID6:

		return OC_NAME_SH;

	default:

		return BE_NAME;
@@ -466,7 +468,8 @@ struct be_adapter { 
#define lancer_chip(adapter)	((adapter->pdev->device == OC_DEVICE_ID3) || \

				 (adapter->pdev->device == OC_DEVICE_ID4))



#define skyhawk_chip(adapter)	(adapter->pdev->device == OC_DEVICE_ID5)

#define skyhawk_chip(adapter)	(adapter->pdev->device == OC_DEVICE_ID5 || \

				 adapter->pdev->device == OC_DEVICE_ID6)





#define be_roce_supported(adapter) ((adapter->if_type == SLI_INTF_TYPE_3 || \

drivers/net/ethernet/emulex/benet/be_main.c

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = { 
	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)},

	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)},

	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID5)},

	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID6)},

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, be_dev_ids);
@@ -3910,6 +3911,7 @@ static int be_dev_type_check(struct be_adapter *adapter) 
		adapter->generation = BE_GEN3;

		break;

	case OC_DEVICE_ID5:

	case OC_DEVICE_ID6:

		pci_read_config_dword(pdev, SLI_INTF_REG_OFFSET, &sli_intf);

		if ((sli_intf & SLI_INTF_VALID_MASK) != SLI_INTF_VALID) {

			dev_err(&pdev->dev, "SLI_INTF reg val is not valid\n");