diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2013-01-12 02:27:23 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-02-01 01:03:36 -0500 |
commit | 0cdc63449df6ee5e7840b3e58554d7a41068b542 (patch) | |
tree | 1960055c6cdc081c5fcd8c3b2600dd73f3dc4520 /drivers/net | |
parent | fd0326f2cf9e5d1d3dbcf4ea0da9accc762c4e52 (diff) |
e1000e: cleanup defines.h
Remove redundant defines which are defined elsewhere.
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')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/defines.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h index d29b2fd4c09c..acfe1fadd8de 100644 --- a/drivers/net/ethernet/intel/e1000e/defines.h +++ b/drivers/net/ethernet/intel/e1000e/defines.h | |||
@@ -29,25 +29,6 @@ | |||
29 | #ifndef _E1000_DEFINES_H_ | 29 | #ifndef _E1000_DEFINES_H_ |
30 | #define _E1000_DEFINES_H_ | 30 | #define _E1000_DEFINES_H_ |
31 | 31 | ||
32 | #define E1000_TXD_POPTS_IXSM 0x01 /* Insert IP checksum */ | ||
33 | #define E1000_TXD_POPTS_TXSM 0x02 /* Insert TCP/UDP checksum */ | ||
34 | #define E1000_TXD_CMD_EOP 0x01000000 /* End of Packet */ | ||
35 | #define E1000_TXD_CMD_IFCS 0x02000000 /* Insert FCS (Ethernet CRC) */ | ||
36 | #define E1000_TXD_CMD_IC 0x04000000 /* Insert Checksum */ | ||
37 | #define E1000_TXD_CMD_RS 0x08000000 /* Report Status */ | ||
38 | #define E1000_TXD_CMD_RPS 0x10000000 /* Report Packet Sent */ | ||
39 | #define E1000_TXD_CMD_DEXT 0x20000000 /* Descriptor extension (0 = legacy) */ | ||
40 | #define E1000_TXD_CMD_VLE 0x40000000 /* Add VLAN tag */ | ||
41 | #define E1000_TXD_CMD_IDE 0x80000000 /* Enable Tidv register */ | ||
42 | #define E1000_TXD_STAT_DD 0x00000001 /* Descriptor Done */ | ||
43 | #define E1000_TXD_STAT_EC 0x00000002 /* Excess Collisions */ | ||
44 | #define E1000_TXD_STAT_LC 0x00000004 /* Late Collisions */ | ||
45 | #define E1000_TXD_STAT_TU 0x00000008 /* Transmit underrun */ | ||
46 | #define E1000_TXD_CMD_TCP 0x01000000 /* TCP packet */ | ||
47 | #define E1000_TXD_CMD_IP 0x02000000 /* IP packet */ | ||
48 | #define E1000_TXD_CMD_TSE 0x04000000 /* TCP Seg enable */ | ||
49 | #define E1000_TXD_STAT_TC 0x00000004 /* Tx Underrun */ | ||
50 | |||
51 | /* Number of Transmit and Receive Descriptors must be a multiple of 8 */ | 32 | /* Number of Transmit and Receive Descriptors must be a multiple of 8 */ |
52 | #define REQ_TX_DESCRIPTOR_MULTIPLE 8 | 33 | #define REQ_TX_DESCRIPTOR_MULTIPLE 8 |
53 | #define REQ_RX_DESCRIPTOR_MULTIPLE 8 | 34 | #define REQ_RX_DESCRIPTOR_MULTIPLE 8 |
@@ -86,7 +67,6 @@ | |||
86 | #define E1000_CTRL_EXT_EIAME 0x01000000 | 67 | #define E1000_CTRL_EXT_EIAME 0x01000000 |
87 | #define E1000_CTRL_EXT_DRV_LOAD 0x10000000 /* Driver loaded bit for FW */ | 68 | #define E1000_CTRL_EXT_DRV_LOAD 0x10000000 /* Driver loaded bit for FW */ |
88 | #define E1000_CTRL_EXT_IAME 0x08000000 /* Interrupt acknowledge Auto-mask */ | 69 | #define E1000_CTRL_EXT_IAME 0x08000000 /* Interrupt acknowledge Auto-mask */ |
89 | #define E1000_CTRL_EXT_INT_TIMER_CLR 0x20000000 /* Clear Interrupt timers after IMS clear */ | ||
90 | #define E1000_CTRL_EXT_PBA_CLR 0x80000000 /* PBA Clear */ | 70 | #define E1000_CTRL_EXT_PBA_CLR 0x80000000 /* PBA Clear */ |
91 | #define E1000_CTRL_EXT_LSECCK 0x00001000 | 71 | #define E1000_CTRL_EXT_LSECCK 0x00001000 |
92 | #define E1000_CTRL_EXT_PHYPDEN 0x00100000 | 72 | #define E1000_CTRL_EXT_PHYPDEN 0x00100000 |
@@ -546,7 +526,6 @@ | |||
546 | #define E1000_RXCW_SYNCH 0x40000000 /* Receive config synch */ | 526 | #define E1000_RXCW_SYNCH 0x40000000 /* Receive config synch */ |
547 | 527 | ||
548 | #define E1000_TSYNCTXCTL_VALID 0x00000001 /* Tx timestamp valid */ | 528 | #define E1000_TSYNCTXCTL_VALID 0x00000001 /* Tx timestamp valid */ |
549 | #define E1000_TSYNCRXCTL_TYPE_ALL 0x08 | ||
550 | #define E1000_TSYNCTXCTL_ENABLED 0x00000010 /* enable Tx timestamping */ | 529 | #define E1000_TSYNCTXCTL_ENABLED 0x00000010 /* enable Tx timestamping */ |
551 | 530 | ||
552 | #define E1000_TSYNCRXCTL_VALID 0x00000001 /* Rx timestamp valid */ | 531 | #define E1000_TSYNCRXCTL_VALID 0x00000001 /* Rx timestamp valid */ |