diff options
| author | Sathya Perla <sathya.perla@emulex.com> | 2012-11-06 21:48:57 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-08 01:59:52 +0400 |
| commit | 5c4f2fb9eee1f6c778efbc62efc58535609bca6c (patch) | |
| tree | a89219744dda34217a839cb42109e2e72b227045 | |
| parent | ca34fe38f06da0f508543539419ff5faa5d81e1c (diff) | |
| download | linux-5c4f2fb9eee1f6c778efbc62efc58535609bca6c.tar.xz | |
be2net: do not use sli_family to identify skyhawk-R chip
SKYHAWK_FAMILY will not identify all revisions of the chip.
Use device-id check (skyhawk_chip() macro) instead.
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be.h | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_hw.h | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_roce.c | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 82f74f8594f5..26b9b8be2bc5 100644 --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h @@ -475,8 +475,8 @@ struct be_adapter { #define BEx_chip(adapter) (BE3_chip(adapter) || BE2_chip(adapter)) #define be_roce_supported(adapter) ((adapter->if_type == SLI_INTF_TYPE_3 || \ - adapter->sli_family == SKYHAWK_SLI_FAMILY) && \ - (adapter->function_mode & RDMA_ENABLED)) + skyhawk_chip(adapter)) && \ + (adapter->function_mode & RDMA_ENABLED)) extern const struct ethtool_ops be_ethtool_ops; diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h index 4ccbc36874e9..c25720760173 100644 --- a/drivers/net/ethernet/emulex/benet/be_hw.h +++ b/drivers/net/ethernet/emulex/benet/be_hw.h @@ -105,11 +105,6 @@ #define SLI_INTF_TYPE_2 2 #define SLI_INTF_TYPE_3 3 -/* SLI family */ -#define BE_SLI_FAMILY 0x0 -#define LANCER_A0_SLI_FAMILY 0xA -#define SKYHAWK_SLI_FAMILY 0x2 - /********* ISR0 Register offset **********/ #define CEV_ISR0_OFFSET 0xC18 #define CEV_ISR_SIZE 4 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index e0e826a38b57..1767babe3173 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -3685,7 +3685,7 @@ static int be_map_pci_bars(struct be_adapter *adapter) if (addr == NULL) goto pci_map_err; adapter->db = addr; - if (adapter->sli_family == SKYHAWK_SLI_FAMILY) { + if (skyhawk_chip(adapter)) { adapter->roce_db.size = 4096; adapter->roce_db.io_addr = pci_resource_start(adapter->pdev, db_reg); diff --git a/drivers/net/ethernet/emulex/benet/be_roce.c b/drivers/net/ethernet/emulex/benet/be_roce.c index deecc44b3617..866900e88df9 100644 --- a/drivers/net/ethernet/emulex/benet/be_roce.c +++ b/drivers/net/ethernet/emulex/benet/be_roce.c @@ -47,7 +47,7 @@ static void _be_roce_dev_add(struct be_adapter *adapter) dev_info.dpp_unmapped_len = 0; } dev_info.pdev = adapter->pdev; - if (adapter->sli_family == SKYHAWK_SLI_FAMILY) + if (skyhawk_chip(adapter)) dev_info.db = adapter->db; else dev_info.db = adapter->roce_db.base; |