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>

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 82f74f8594f54f6516a88e37dbfdb48d389b0689..26b9b8be2bc56a641c3d80a1c68f44429ac8273d 100644 (file)
--- 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 4ccbc36874e9ee6336cc287d98b0faad8ebaa9f2..c2572076017360d988177cab6f2a7bc0c5d1cd60 100644 (file)
--- 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 e0e826a38b579323ae3decb4fc6f1c8608fcb736..1767babe31737e5d61cafab2d342c8d7a66714d1 100644 (file)
--- 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 deecc44b36177aff72f65f1a258d5b7391827a6e..866900e88df9f9fd792a2f53d8086c25bf17c75f 100644 (file)
--- 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;