diff options
author | Ajit Khaparde <ajitk@serverengines.com> | 2009-10-16 21:02:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-16 21:02:12 -0400 |
commit | 12d7ea2c5a5c87834daf9fcd920aab80ff6248b1 (patch) | |
tree | 780152d27e4e431e0ed13b08f954c4d880388779 | |
parent | 21912d1ca2546ca96743c91d5a4125aef2d9df70 (diff) |
be2net: Add support for next generation of BladeEngine device.
Add new PCI ids to support next generation of BladeEngine device.
Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/benet/be.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 4b61a9154222..ce7563175cef 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h | |||
@@ -35,20 +35,31 @@ | |||
35 | #define DRV_VER "2.101.205" | 35 | #define DRV_VER "2.101.205" |
36 | #define DRV_NAME "be2net" | 36 | #define DRV_NAME "be2net" |
37 | #define BE_NAME "ServerEngines BladeEngine2 10Gbps NIC" | 37 | #define BE_NAME "ServerEngines BladeEngine2 10Gbps NIC" |
38 | #define BE3_NAME "ServerEngines BladeEngine3 10Gbps NIC" | ||
38 | #define OC_NAME "Emulex OneConnect 10Gbps NIC" | 39 | #define OC_NAME "Emulex OneConnect 10Gbps NIC" |
40 | #define OC_NAME1 "Emulex OneConnect 10Gbps NIC (be3)" | ||
39 | #define DRV_DESC BE_NAME "Driver" | 41 | #define DRV_DESC BE_NAME "Driver" |
40 | 42 | ||
41 | #define BE_VENDOR_ID 0x19a2 | 43 | #define BE_VENDOR_ID 0x19a2 |
42 | #define BE_DEVICE_ID1 0x211 | 44 | #define BE_DEVICE_ID1 0x211 |
45 | #define BE_DEVICE_ID2 0x221 | ||
43 | #define OC_DEVICE_ID1 0x700 | 46 | #define OC_DEVICE_ID1 0x700 |
44 | #define OC_DEVICE_ID2 0x701 | 47 | #define OC_DEVICE_ID2 0x701 |
48 | #define OC_DEVICE_ID3 0x710 | ||
45 | 49 | ||
46 | static inline char *nic_name(struct pci_dev *pdev) | 50 | static inline char *nic_name(struct pci_dev *pdev) |
47 | { | 51 | { |
48 | if (pdev->device == OC_DEVICE_ID1 || pdev->device == OC_DEVICE_ID2) | 52 | switch (pdev->device) { |
53 | case OC_DEVICE_ID1: | ||
54 | case OC_DEVICE_ID2: | ||
49 | return OC_NAME; | 55 | return OC_NAME; |
50 | else | 56 | case OC_DEVICE_ID3: |
57 | return OC_NAME1; | ||
58 | case BE_DEVICE_ID2: | ||
59 | return BE3_NAME; | ||
60 | default: | ||
51 | return BE_NAME; | 61 | return BE_NAME; |
62 | } | ||
52 | } | 63 | } |
53 | 64 | ||
54 | /* Number of bytes of an RX frame that are copied to skb->data */ | 65 | /* Number of bytes of an RX frame that are copied to skb->data */ |