ixgbe: Enable another bit for flow control operation
authorPJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
Thu, 9 Apr 2009 22:26:21 +0000 (22:26 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Apr 2009 09:47:57 +0000 (02:47 -0700)
The discard pause frames bit was not enabled, so flow control frames could
be passed up to the host.  Enabled DPF to keep the frames off the stack.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ixgbe/ixgbe_82598.c
drivers/net/ixgbe/ixgbe_common.c

index de4db0dc78795c925882d11a9c830cbd416e4102..63aacd53aab7a7af0c3995b563e4bf94dec1a07d 100644 (file)
@@ -322,6 +322,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
        }
 
        /* Enable 802.3x based flow control settings. */
+       fctrl_reg |= IXGBE_FCTRL_DPF;
        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl_reg);
        IXGBE_WRITE_REG(hw, IXGBE_RMCS, rmcs_reg);
 
index 63ab6671d08e34b5cf0d54a0aa269a40c5d983a4..846c9deeaa7ad08b29eb2c45b95451408f90d3be 100644 (file)
@@ -1700,6 +1700,7 @@ s32 ixgbe_fc_enable(struct ixgbe_hw *hw, s32 packetbuf_num)
        }
 
        /* Enable 802.3x based flow control settings. */
+       mflcn_reg |= IXGBE_MFLCN_DPF;
        IXGBE_WRITE_REG(hw, IXGBE_MFLCN, mflcn_reg);
        IXGBE_WRITE_REG(hw, IXGBE_FCCFG, fccfg_reg);