git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
ixgbe
/
ixgbe_main.c
diff --git
a/drivers/net/ixgbe/ixgbe_main.c
b/drivers/net/ixgbe/ixgbe_main.c
index
04e64de
..
6b483d3
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;