summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
diff options
context:
space:
mode:
authorMerav Sicron2012-06-19 09:48:22 +0200
committerDavid S. Miller2012-06-19 23:34:34 +0200
commit8970b2e4393a34ddf5832f9c1568a88087b0d948 (patch)
treeb6120c5b132d3dc974af2d7d425441c70a8cc278 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
parentnet: lpc_eth: Driver cleanup (diff)
downloadkernel-qcow2-linux-8970b2e4393a34ddf5832f9c1568a88087b0d948.tar.gz
kernel-qcow2-linux-8970b2e4393a34ddf5832f9c1568a88087b0d948.tar.xz
kernel-qcow2-linux-8970b2e4393a34ddf5832f9c1568a88087b0d948.zip
bnx2x: Add support for external LB
This change enables to do self-test with external loopback via ethtool. Signed-off-by: Merav Sicron <meravs@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 8098eea9704d..9370f5ffaf4a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2176,6 +2176,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
break;
case LOAD_DIAG:
+ case LOAD_LOOPBACK_EXT:
bp->state = BNX2X_STATE_DIAG;
break;
@@ -2215,7 +2216,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
return -EBUSY;
}
- bnx2x_dcbx_init(bp);
+ if (bp->state != BNX2X_STATE_DIAG)
+ bnx2x_dcbx_init(bp);
return 0;
#ifndef BNX2X_STOP_ON_ERROR