Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6f70f6acc7321f9f6501157b29d2db8c475cf3b2

Authored by John Fastabend
Committed by Jeff Kirsher
1 parent 86b4db3bcc
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ixgbe: fix bit mask for DCB version 

This bit mask is wrong DCBX_HOST is always set. It was missed up
until now because lldpad reprograms the device on a link
event. However this is still wrong and it is best not to be
mis-configured for some time immediately following ixgbe_up().

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/net/ixgbe/ixgbe_main.c
Diff comments   View file @ 6f70f6a
... ... @@ -3745,7 +3745,7 @@
3745 3745 hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
3746 3746  
3747 3747 /* reconfigure the hardware */
3748   - if (adapter->dcbx_cap & (DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_CEE)) {
  3748 + if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
3749 3749 #ifdef CONFIG_FCOE
3750 3750 if (adapter->netdev->features & NETIF_F_FCOE_MTU)
3751 3751 max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);