]> git.hungrycats.org Git - linux/commitdiff
ixgbe: fix broken PFC with X550
authorVasu Dev <vasu.dev@intel.com>
Mon, 23 Nov 2015 18:31:25 +0000 (10:31 -0800)
committerJiri Slaby <jslaby@suse.cz>
Mon, 7 Mar 2016 14:40:54 +0000 (15:40 +0100)
commit cb78cf12d6e90f57f6e7d090867ef19b6a189dde upstream.

PFC is configuration is skipped for X550 devices due to a incorrect
device id check, fixing that to include X550 PFC configuration.

Signed-off-by: Vasu Dev <vasu.dev@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c

index 05e23b80b5e37b70f1f0e18a0b3be826915623c3..a5cc8a674e063a16e537af2a2f9b7e9e90584b41 100644 (file)
@@ -222,13 +222,13 @@ s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en, u8 *prio_tc)
        reg |= IXGBE_MFLCN_DPF;
 
        /*
-        * X540 supports per TC Rx priority flow control.  So
-        * clear all TCs and only enable those that should be
+        * X540 & X550 supports per TC Rx priority flow control.
+        * So clear all TCs and only enable those that should be
         * enabled.
         */
        reg &= ~(IXGBE_MFLCN_RPFCE_MASK | IXGBE_MFLCN_RFCE);
 
-       if (hw->mac.type == ixgbe_mac_X540)
+       if (hw->mac.type >= ixgbe_mac_X540)
                reg |= pfc_en << IXGBE_MFLCN_RPFCE_SHIFT;
 
        if (pfc_en)