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

Commit ecedb6ae authored by Ajit Khaparde's avatar Ajit Khaparde Committed by David S. Miller
Browse files

be2net: Add support for Skyhawk cards 



Signed-off-by: default avatarAjit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 869aa410

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

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#define OC_NAME			"Emulex OneConnect 10Gbps NIC"

#define OC_NAME_BE		OC_NAME	"(be3)"

#define OC_NAME_LANCER		OC_NAME "(Lancer)"

#define OC_NAME_SH		OC_NAME "(Skyhawk)"

#define DRV_DESC		"ServerEngines BladeEngine 10Gbps NIC Driver"



#define BE_VENDOR_ID 		0x19a2
@@ -50,6 +51,7 @@ 
#define OC_DEVICE_ID2		0x710	/* Device Id for BE3 cards */

#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 */



static inline char *nic_name(struct pci_dev *pdev)

{
@@ -63,6 +65,8 @@ static inline char *nic_name(struct pci_dev *pdev) 
		return OC_NAME_LANCER;

	case BE_DEVICE_ID2:

		return BE3_NAME;

	case OC_DEVICE_ID5:

		return OC_NAME_SH;

	default:

		return BE_NAME;

	}

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = { 
	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },

	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)},

	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)},

	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID5)},

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, be_dev_ids);
@@ -3312,6 +3313,7 @@ static int be_dev_family_check(struct be_adapter *adapter) 
		break;

	case BE_DEVICE_ID2:

	case OC_DEVICE_ID2:

	case OC_DEVICE_ID5:

		adapter->generation = BE_GEN3;

		break;

	case OC_DEVICE_ID3: