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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[pandora-kernel.git]
/
drivers
/
net
/
ixgbe
/
ixgbe_type.h
diff --git
a/drivers/net/ixgbe/ixgbe_type.h
b/drivers/net/ixgbe/ixgbe_type.h
index
95fc36c
..
2b2ecba
100644
(file)
--- a/
drivers/net/ixgbe/ixgbe_type.h
+++ b/
drivers/net/ixgbe/ixgbe_type.h
@@
-1939,6
+1939,9
@@
enum ixgbe_fc_mode {
ixgbe_fc_rx_pause,
ixgbe_fc_tx_pause,
ixgbe_fc_full,
+#ifdef CONFIG_DCB
+ ixgbe_fc_pfc,
+#endif
ixgbe_fc_default
};