diff options
author | Jack F Vogel <jfv@FreeBSD.org> | 2010-09-28 00:13:15 +0000 |
---|---|---|
committer | Jack F Vogel <jfv@FreeBSD.org> | 2010-09-28 00:13:15 +0000 |
commit | 7d9119bdc4774dc34eeac8fea0d3e0fe8c704fc4 (patch) | |
tree | 21280311b19d0a44f429c7a43c6e9ff933e22698 /sys/dev/e1000/e1000_82571.h | |
parent | 332bbeddddc50b02d0123c9973f5875d4e68e006 (diff) | |
download | src-7d9119bdc4774dc34eeac8fea0d3e0fe8c704fc4.tar.gz src-7d9119bdc4774dc34eeac8fea0d3e0fe8c704fc4.zip |
Update code from Intel:
- Sync shared code with Intel internal
- New client chipset support added
- em driver - fixes to 82574, limit queues to 1 but use MSIX
- em driver - large changes in TX checksum offload and tso
code, thanks to yongari.
- some small changes for watchdog issues.
- igb driver - local timer watchdog code was missing locking
this and a couple other watchdog related fixes.
- bug in rx discard found by Andrew Boyer, check for null pointer
MFC: a week
Notes
Notes:
svn path=/head/; revision=213234
Diffstat (limited to 'sys/dev/e1000/e1000_82571.h')
-rw-r--r-- | sys/dev/e1000/e1000_82571.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/e1000/e1000_82571.h b/sys/dev/e1000/e1000_82571.h index 5e66793c0138..c76f16fe1798 100644 --- a/sys/dev/e1000/e1000_82571.h +++ b/sys/dev/e1000/e1000_82571.h @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2008, Intel Corporation + Copyright (c) 2001-2010, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ (ID_LED_DEF1_DEF2)) #define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000 +#define AN_RETRY_COUNT 5 /* Autoneg Retry Count value */ /* Intr Throttling - RW */ #define E1000_EITR_82574(_n) (0x000E8 + (0x4 * (_n))) @@ -53,6 +54,11 @@ #define E1000_RXCFGL 0x0B634 /* TimeSync Rx EtherType & Msg Type Reg - RW */ +#define E1000_BASE1000T_STATUS 10 +#define E1000_IDLE_ERROR_COUNT_MASK 0xFF +#define E1000_RECEIVE_ERROR_COUNTER 21 +#define E1000_RECEIVE_ERROR_MAX 0xFFFF +bool e1000_check_phy_82574(struct e1000_hw *hw); bool e1000_get_laa_state_82571(struct e1000_hw *hw); void e1000_set_laa_state_82571(struct e1000_hw *hw, bool state); |