diff options
| author | John Fastabend <john.r.fastabend@intel.com> | 2010-06-03 17:03:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-04 15:56:00 -0700 |
| commit | ca739481662137b8f717bc21f16719cda3c33d6b (patch) | |
| tree | 8faf60448253ee555d8ff466f0a62eb6e3c743ee /drivers | |
| parent | 8764ab2ca7ab5055e1ca80f9cfa4970c34acb804 (diff) | |
| download | kernel_samsung_espresso10-ca739481662137b8f717bc21f16719cda3c33d6b.zip kernel_samsung_espresso10-ca739481662137b8f717bc21f16719cda3c33d6b.tar.gz kernel_samsung_espresso10-ca739481662137b8f717bc21f16719cda3c33d6b.tar.bz2 | |
ixgbe: only check pfc bits in hang logic if pfc is enabled
Only check pfc bits in hang logic if PFC is enabled. Previously,
if DCB was enabled but PFC was disabled the incorrect pause
bits would be checked.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index d571d10..b2af2f6 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -642,7 +642,7 @@ static inline bool ixgbe_tx_xon_state(struct ixgbe_adapter *adapter, u32 txoff = IXGBE_TFCS_TXOFF; #ifdef CONFIG_IXGBE_DCB - if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { + if (adapter->dcb_cfg.pfc_mode_enable) { int tc; int reg_idx = tx_ring->reg_idx; int dcb_i = adapter->ring_feature[RING_F_DCB].indices; |