projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8764ab2
)
ixgbe: only check pfc bits in hang logic if pfc is enabled
author
John Fastabend
<
[email protected]
>
Thu, 3 Jun 2010 17:03:45 +0000
(17:03 +0000)
committer
David S. Miller
<
[email protected]
>
Fri, 4 Jun 2010 22:56:00 +0000
(15:56 -0700)
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 <
[email protected]
>
Acked-by: Don Skidmore <
[email protected]
>
Signed-off-by: Jeff Kirsher <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ixgbe/ixgbe_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ixgbe/ixgbe_main.c
b/drivers/net/ixgbe/ixgbe_main.c
index d571d101de08fb4c183af77cb9b64d10904d10a7..b2af2f67f604c2d24018a2e9af8307e5e33d5828 100644
(file)
--- 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;