diff options
author | Renato Botelho <renato@netgate.com> | 2016-02-01 08:33:00 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-02-01 08:33:00 -0200 |
commit | 79f27b5150f7b79a6f1bcd30e9233f1abb9c3e36 (patch) | |
tree | 4aacd7410a3c5961c66492d9c6cb2441e5180961 /sys/dev/e1000/e1000_82571.h | |
parent | 00da2a1c8c0008725cae2d87abfe17736bf0318a (diff) | |
parent | 42ee9ca9933fb815ce7d9098f10bad6fe38c69b4 (diff) | |
download | FreeBSD-src-79f27b5150f7b79a6f1bcd30e9233f1abb9c3e36.zip FreeBSD-src-79f27b5150f7b79a6f1bcd30e9233f1abb9c3e36.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/dev/e1000/e1000_82571.h')
-rw-r--r-- | sys/dev/e1000/e1000_82571.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/e1000/e1000_82571.h b/sys/dev/e1000/e1000_82571.h index 41d5df0..1d7718e 100644 --- a/sys/dev/e1000/e1000_82571.h +++ b/sys/dev/e1000/e1000_82571.h @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2014, Intel Corporation + Copyright (c) 2001-2015, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -50,10 +50,9 @@ #define E1000_EIAC_82574 0x000DC /* Ext. Interrupt Auto Clear - RW */ #define E1000_EIAC_MASK_82574 0x01F00000 -#define E1000_IVAR_INT_ALLOC_VALID 0x8 +#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */ -/* Manageability Operation Mode mask */ -#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 +#define E1000_RXCFGL 0x0B634 /* TimeSync Rx EtherType & Msg Type Reg - RW */ #define E1000_BASE1000T_STATUS 10 #define E1000_IDLE_ERROR_COUNT_MASK 0xFF |