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 git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[pandora-kernel.git]
/
drivers
/
net
/
ixgbe
/
ixgbe.h
diff --git
a/drivers/net/ixgbe/ixgbe.h
b/drivers/net/ixgbe/ixgbe.h
index
dd688d4
..
385be60
100644
(file)
--- a/
drivers/net/ixgbe/ixgbe.h
+++ b/
drivers/net/ixgbe/ixgbe.h
@@
-267,7
+267,8
@@
struct ixgbe_adapter {
enum ixgbe_fc_mode last_lfc_mode;
/* Interrupt Throttle Rate */
enum ixgbe_fc_mode last_lfc_mode;
/* Interrupt Throttle Rate */
- u32 itr_setting;
+ u32 rx_itr_setting;
+ u32 tx_itr_setting;
u16 eitr_low;
u16 eitr_high;
u16 eitr_low;
u16 eitr_high;
@@
-351,7
+352,8
@@
struct ixgbe_adapter {
struct ixgbe_hw_stats stats;
/* Interrupt Throttle Rate */
struct ixgbe_hw_stats stats;
/* Interrupt Throttle Rate */
- u32 eitr_param;
+ u32 rx_eitr_param;
+ u32 tx_eitr_param;
unsigned long state;
u64 tx_busy;
unsigned long state;
u64 tx_busy;