diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-20 22:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-20 22:33:42 -0400 |
| commit | b216a4d86fb599fa2808ea7456e15ca9b47bc756 (patch) | |
| tree | 5eac23884cd85d45851c223dbc1822a9bf378cd3 /drivers/net/ethernet/intel/igb/e1000_regs.h | |
| parent | 127a479442790d175811547dd95241dce9812ec5 (diff) | |
| parent | 012dc19a45b2b9cc2ebd14aaa401cf782c2abba4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to igb and ixgbevf.
v2: updated patch description in 04 patch (ixgbevf: scheduling while
atomic in reset hw path)
...
Akeem G. Abodunrin (1):
igb: Support to enable EEE on all eee_supported devices
Alexander Duyck (2):
igb: Remove artificial restriction on RQDPC stat reading
ixgbevf: Add support for VF API negotiation
John Fastabend (1):
ixgbevf: scheduling while atomic in reset hw path
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_regs.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h index faec840a5a8a..e5db48594e8a 100644 --- a/drivers/net/ethernet/intel/igb/e1000_regs.h +++ b/drivers/net/ethernet/intel/igb/e1000_regs.h | |||
| @@ -349,6 +349,7 @@ | |||
| 349 | /* Energy Efficient Ethernet "EEE" register */ | 349 | /* Energy Efficient Ethernet "EEE" register */ |
| 350 | #define E1000_IPCNFG 0x0E38 /* Internal PHY Configuration */ | 350 | #define E1000_IPCNFG 0x0E38 /* Internal PHY Configuration */ |
| 351 | #define E1000_EEER 0x0E30 /* Energy Efficient Ethernet */ | 351 | #define E1000_EEER 0x0E30 /* Energy Efficient Ethernet */ |
| 352 | #define E1000_EEE_SU 0X0E34 /* EEE Setup */ | ||
| 352 | 353 | ||
| 353 | /* Thermal Sensor Register */ | 354 | /* Thermal Sensor Register */ |
| 354 | #define E1000_THSTAT 0x08110 /* Thermal Sensor Status */ | 355 | #define E1000_THSTAT 0x08110 /* Thermal Sensor Status */ |