aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/emulex/benet/be.h4
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index a3588fb8d6a9..995198d72b84 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -40,6 +40,7 @@
40#define OC_NAME "Emulex OneConnect 10Gbps NIC" 40#define OC_NAME "Emulex OneConnect 10Gbps NIC"
41#define OC_NAME_BE OC_NAME "(be3)" 41#define OC_NAME_BE OC_NAME "(be3)"
42#define OC_NAME_LANCER OC_NAME "(Lancer)" 42#define OC_NAME_LANCER OC_NAME "(Lancer)"
43#define OC_NAME_SH OC_NAME "(Skyhawk)"
43#define DRV_DESC "ServerEngines BladeEngine 10Gbps NIC Driver" 44#define DRV_DESC "ServerEngines BladeEngine 10Gbps NIC Driver"
44 45
45#define BE_VENDOR_ID 0x19a2 46#define BE_VENDOR_ID 0x19a2
@@ -50,6 +51,7 @@
50#define OC_DEVICE_ID2 0x710 /* Device Id for BE3 cards */ 51#define OC_DEVICE_ID2 0x710 /* Device Id for BE3 cards */
51#define OC_DEVICE_ID3 0xe220 /* Device id for Lancer cards */ 52#define OC_DEVICE_ID3 0xe220 /* Device id for Lancer cards */
52#define OC_DEVICE_ID4 0xe228 /* Device id for VF in Lancer */ 53#define OC_DEVICE_ID4 0xe228 /* Device id for VF in Lancer */
54#define OC_DEVICE_ID5 0x720 /* Device Id for Skyhawk cards */
53 55
54static inline char *nic_name(struct pci_dev *pdev) 56static inline char *nic_name(struct pci_dev *pdev)
55{ 57{
@@ -63,6 +65,8 @@ static inline char *nic_name(struct pci_dev *pdev)
63 return OC_NAME_LANCER; 65 return OC_NAME_LANCER;
64 case BE_DEVICE_ID2: 66 case BE_DEVICE_ID2:
65 return BE3_NAME; 67 return BE3_NAME;
68 case OC_DEVICE_ID5:
69 return OC_NAME_SH;
66 default: 70 default:
67 return BE_NAME; 71 return BE_NAME;
68 } 72 }
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 9b5304a653f3..b145a4963947 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -42,6 +42,7 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {
42 { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) }, 42 { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
43 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)}, 43 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)},
44 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)}, 44 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)},
45 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID5)},
45 { 0 } 46 { 0 }
46}; 47};
47MODULE_DEVICE_TABLE(pci, be_dev_ids); 48MODULE_DEVICE_TABLE(pci, be_dev_ids);
@@ -3312,6 +3313,7 @@ static int be_dev_family_check(struct be_adapter *adapter)
3312 break; 3313 break;
3313 case BE_DEVICE_ID2: 3314 case BE_DEVICE_ID2:
3314 case OC_DEVICE_ID2: 3315 case OC_DEVICE_ID2:
3316 case OC_DEVICE_ID5:
3315 adapter->generation = BE_GEN3; 3317 adapter->generation = BE_GEN3;
3316 break; 3318 break;
3317 case OC_DEVICE_ID3: 3319 case OC_DEVICE_ID3: