diff options
| author | Yuval Mintz <yuvalmin@broadcom.com> | 2012-12-02 04:05:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-02 20:23:00 -0500 |
| commit | 382e513a18ef988e547b0744c63c110aa052afd2 (patch) | |
| tree | c45efd8da7df5bc72a4dbc6eabeaa10f814984b7 | |
| parent | 7964211d3891d0271c5fc8087cd49c018b30476d (diff) | |
| download | linux-3.10-382e513a18ef988e547b0744c63c110aa052afd2.tar.gz linux-3.10-382e513a18ef988e547b0744c63c110aa052afd2.tar.bz2 linux-3.10-382e513a18ef988e547b0744c63c110aa052afd2.zip | |
bnx2x: Ext. config accessed only on non-E1x.
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 89b3d10e157..571508d044c 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -10484,8 +10484,9 @@ static void __devinit bnx2x_get_fcoe_info(struct bnx2x *bp) if (BNX2X_MF_EXT_PROTOCOL_FCOE(bp) && !CHIP_IS_E1x(bp)) bnx2x_get_ext_wwn_info(bp, func); - } else if (IS_MF_FCOE_SD(bp)) + } else if (IS_MF_FCOE_SD(bp) && !CHIP_IS_E1x(bp)) { bnx2x_get_ext_wwn_info(bp, func); + } BNX2X_DEV_INFO("max_fcoe_conn 0x%x\n", bp->cnic_eth_dev.max_fcoe_conn); |