33c33
< /*$FreeBSD: head/sys/dev/e1000/e1000_defines.h 287990 2015-09-19 18:22:59Z sbruno $*/
---
> /*$FreeBSD: head/sys/dev/e1000/e1000_defines.h 295323 2016-02-05 17:14:37Z erj $*/
199a200,201
> #define E1000_RCTL_RDMTS_HEX 0x00010000
> #define E1000_RCTL_RDMTS1_HEX E1000_RCTL_RDMTS_HEX
755a758,763
> /* HH Time Sync */
> #define E1000_TSYNCTXCTL_MAX_ALLOWED_DLY_MASK 0x0000F000 /* max delay */
> #define E1000_TSYNCTXCTL_SYNC_COMP_ERR 0x20000000 /* sync err */
> #define E1000_TSYNCTXCTL_SYNC_COMP 0x40000000 /* sync complete */
> #define E1000_TSYNCTXCTL_START_SYNC 0x80000000 /* initiate sync */
>
851a860
> #define E1000_M88E1543_FIBER_CTRL 0x0 /* Fiber Control Register */
1023d1031
< #ifndef E1000_NVM_GRANT_ATTEMPTS
1025d1032
< #endif