diff options
author | Barak Witkowski | 2012-06-19 09:48:31 +0200 |
---|---|---|
committer | David S. Miller | 2012-06-19 23:34:35 +0200 |
commit | 9876879fce3081cd9f3f2b9e995954d423bcd863 (patch) | |
tree | f8a923b2268ee74ea9141402be5e38d12147197c /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
parent | bnx2x: Add support for ethtool -L (diff) | |
download | kernel-qcow2-linux-9876879fce3081cd9f3f2b9e995954d423bcd863.tar.gz kernel-qcow2-linux-9876879fce3081cd9f3f2b9e995954d423bcd863.tar.xz kernel-qcow2-linux-9876879fce3081cd9f3f2b9e995954d423bcd863.zip |
bnx2x: Support DCBX for all functions
In multi-function device, allow configuring dcbx admin params from all drivers
on a single physical port.
Signed-off-by: Barak Witkowski <barak@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.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 829befbc20a5..00951b3aa62b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -2274,8 +2274,10 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) return -EBUSY; } - if (bp->state != BNX2X_STATE_DIAG) - bnx2x_dcbx_init(bp); + /* If PMF - send ADMIN DCBX msg to MFW to initiate DCBX FSM */ + if (bp->port.pmf && (bp->state != BNX2X_STATE_DIAG)) + bnx2x_dcbx_init(bp, false); + return 0; #ifndef BNX2X_STOP_ON_ERROR |