diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 16:08:51 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 16:08:51 +0900 |
| commit | b9a3acf46afdafc601947136f63e9dd228cd86e8 (patch) | |
| tree | 2b206b6d3c51f673c94fbcdf03df2a699e7110d2 /drivers/net/bnx2x/bnx2x_dcb.c | |
| parent | 9f0fa7991af382bfa8c9575d2457a0b6ad03ac4c (diff) | |
| parent | 21d41f2b312231536cf981c960c83cc4493c0293 (diff) | |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_dcb.c')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_dcb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_dcb.c b/drivers/net/bnx2x/bnx2x_dcb.c index a4ea35f6a45..a1e004a82f7 100644 --- a/drivers/net/bnx2x/bnx2x_dcb.c +++ b/drivers/net/bnx2x/bnx2x_dcb.c @@ -920,7 +920,7 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp, void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled) { - if (!CHIP_IS_E1x(bp)) { + if (!CHIP_IS_E1x(bp) && !CHIP_IS_E3(bp)) { bp->dcb_state = dcb_on; bp->dcbx_enabled = dcbx_enabled; } else { |