bnx2x: Restore FCoE 4-port devices support

bnx2x FW 1.78.17 properly supports DCBX configuration for 4-port devices,
enabling FCoE support on 57840 boards.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index c7df223d7a109d3e69b2ae1f7f9a53a9acda1b08..04d123ff11a2a976a26380f407a7a585a2dd57a9 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12492,16 +12492,6 @@ static int bnx2x_init_one(struct pci_dev *pdev,
        if (CHIP_IS_E1x(bp))
                bp->flags |= NO_FCOE_FLAG;
 
-       /* disable FCOE for 57840 device, until FW supports it */
-       switch (ent->driver_data) {
-       case BCM57840_O:
-       case BCM57840_4_10:
-       case BCM57840_2_20:
-       case BCM57840_MFO:
-       case BCM57840_MF:
-               bp->flags |= NO_FCOE_FLAG;
-       }
-
        /* Set bp->num_queues for MSI-X mode*/
        bnx2x_set_num_queues(bp);