diff options
| author | Barak Witkowski <barak@broadcom.com> | 2012-12-02 05:05:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-03 02:23:00 +0100 |
| commit | 0370cf901dd923ce784efe486c8ba66babad693b (patch) | |
| tree | c63ba1f6deea31ac1fd62dffe0f3c6bc4ba5f707 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | |
| parent | bnx2x: Handle a rarely missed interrupt (diff) | |
| download | linux-0370cf901dd923ce784efe486c8ba66babad693b.tar.xz linux-0370cf901dd923ce784efe486c8ba66babad693b.zip | |
bnx2x: prevent DCB if disabled in nvram
Signed-off-by: Barak Witkowski <barak@broadcom.com>
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c index c0d9b6947d97..c8c034027ce5 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c @@ -1904,6 +1904,11 @@ static u8 bnx2x_dcbnl_set_state(struct net_device *netdev, u8 state) struct bnx2x *bp = netdev_priv(netdev); DP(BNX2X_MSG_DCB, "state = %s\n", state ? "on" : "off"); + if (state && ((bp->dcbx_enabled == BNX2X_DCBX_ENABLED_OFF) || + (bp->dcbx_enabled == BNX2X_DCBX_ENABLED_INVALID))) { + DP(BNX2X_MSG_DCB, "Can not set dcbx to enabled while it is disabled in nvm\n"); + return 1; + } bnx2x_dcbx_set_state(bp, (state ? true : false), bp->dcbx_enabled); return 0; } |