* [net-2.6 PATCH] ixgbe: only check pfc bits in hang logic if pfc is enabled
@ 2010-06-04 3:03 Jeff Kirsher
2010-06-04 22:58 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2010-06-04 3:03 UTC (permalink / raw)
To: davem; +Cc: netdev, gospo, John Fastabend, Don Skidmore, Jeff Kirsher
From: John Fastabend <john.r.fastabend@intel.com>
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>
---
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [net-2.6 PATCH] ixgbe: only check pfc bits in hang logic if pfc is enabled
2010-06-04 3:03 [net-2.6 PATCH] ixgbe: only check pfc bits in hang logic if pfc is enabled Jeff Kirsher
@ 2010-06-04 22:58 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-06-04 22:58 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, john.r.fastabend, donald.c.skidmore
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 03 Jun 2010 20:03:45 -0700
> From: John Fastabend <john.r.fastabend@intel.com>
>
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-04 22:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-04 3:03 [net-2.6 PATCH] ixgbe: only check pfc bits in hang logic if pfc is enabled Jeff Kirsher
2010-06-04 22:58 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).