diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2013-01-22 08:44:35 +0000 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-02-05 00:12:27 -0800 |
commit | 948f97aca6700ea96647719185d83a0b7c312fc1 (patch) | |
tree | e87b3905aea47626c538a06fae94da608f68846e /drivers/net/ethernet/intel/e1000e/hw.h | |
parent | d22631134d86b15689e6fea907aa97fffd88dbf6 (diff) | |
download | blackbird-op-linux-948f97aca6700ea96647719185d83a0b7c312fc1.tar.gz blackbird-op-linux-948f97aca6700ea96647719185d83a0b7c312fc1.zip |
e1000e: cosmetic move of #defines and prototypes to the new manage.h
Move #defines, function prototypes and data types which are applicable to
all/most devices supported by the driver but are specific to the
manageability component of each device to the new manage.h header file.
These #defines, function prototypes and data types can be used by other
files in the driver and moving them to the manageability-specific file
makes it clearer to which component they are applicable.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/hw.h')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/hw.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h index 97b8746a08cd..de876bd85cdf 100644 --- a/drivers/net/ethernet/intel/e1000e/hw.h +++ b/drivers/net/ethernet/intel/e1000e/hw.h @@ -244,28 +244,6 @@ enum e1e_registers { E1000_RXUDP = 0x0B638, /* Timesync Rx UDP Port - RW */ }; -/* manage.c */ -#define E1000_VFTA_ENTRY_SHIFT 5 -#define E1000_VFTA_ENTRY_MASK 0x7F -#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK 0x1F - -#define E1000_HICR_EN 0x01 /* Enable bit - RO */ -/* Driver sets this bit when done to put command in RAM */ -#define E1000_HICR_C 0x02 -#define E1000_HICR_FW_RESET_ENABLE 0x40 -#define E1000_HICR_FW_RESET 0x80 - -#define E1000_FWSM_MODE_MASK 0xE -#define E1000_FWSM_MODE_SHIFT 1 - -#define E1000_MNG_IAMT_MODE 0x3 -#define E1000_MNG_DHCP_COOKIE_LENGTH 0x10 -#define E1000_MNG_DHCP_COOKIE_OFFSET 0x6F0 -#define E1000_MNG_DHCP_COMMAND_TIMEOUT 10 -#define E1000_MNG_DHCP_TX_PAYLOAD_CMD 64 -#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING 0x1 -#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN 0x2 - #define E1000_DEV_ID_82571EB_COPPER 0x105E #define E1000_DEV_ID_82571EB_FIBER 0x105F #define E1000_DEV_ID_82571EB_SERDES 0x1060 @@ -675,6 +653,7 @@ struct e1000_host_mng_command_info { #include "mac.h" #include "phy.h" #include "nvm.h" +#include "manage.h" /* Function pointers for the MAC. */ struct e1000_mac_operations { |