Skip to content

Commit d582891

Browse files
ravargilJeff Kirsher
authored andcommitted
e1000e: Cosmetic changes
1) Replace spaces with tab. 2) Move ich8lan related define to the proper context. Signed-off-by: Raanan Avargil <raanan.avargil@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
1 parent f5ac744 commit d582891

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

drivers/net/ethernet/intel/e1000e/ich8lan.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@
106106
#define E1000_FEXTNVM11_DISABLE_MULR_FIX 0x00002000
107107

108108
/* bit24: RXDCTL thresholds granularity: 0 - cache lines, 1 - descriptors */
109-
#define E1000_RXDCTL_THRESH_UNIT_DESC 0x01000000
109+
#define E1000_RXDCTL_THRESH_UNIT_DESC 0x01000000
110110

111111
#define K1_ENTRY_LATENCY 0
112112
#define K1_MIN_TIME 1
113113
#define NVM_SIZE_MULTIPLIER 4096 /*multiplier for NVMS field */
114114
#define E1000_FLASH_BASE_ADDR 0xE000 /*offset of NVM access regs */
115115
#define E1000_CTRL_EXT_NVMVS 0x3 /*NVM valid sector */
116-
116+
#define E1000_TARC0_CB_MULTIQ_3_REQ (1 << 28 | 1 << 29)
117117
#define PCIE_ICH8_SNOOP_ALL PCIE_NO_SNOOP_ALL
118118

119119
#define E1000_ICH_RAR_ENTRIES 7

drivers/net/ethernet/intel/e1000e/regs.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
#define E1000_FEXTNVM4 0x00024 /* Future Extended NVM 4 - RW */
3939
#define E1000_FEXTNVM6 0x00010 /* Future Extended NVM 6 - RW */
4040
#define E1000_FEXTNVM7 0x000E4 /* Future Extended NVM 7 - RW */
41-
#define E1000_FEXTNVM9 0x5BB4 /* Future Extended NVM 9 - RW */
42-
#define E1000_FEXTNVM11 0x5BBC /* Future Extended NVM 11 - RW */
41+
#define E1000_FEXTNVM9 0x5BB4 /* Future Extended NVM 9 - RW */
42+
#define E1000_FEXTNVM11 0x5BBC /* Future Extended NVM 11 - RW */
4343
#define E1000_PCIEANACFG 0x00F18 /* PCIE Analog Config */
4444
#define E1000_FCT 0x00030 /* Flow Control Type - RW */
4545
#define E1000_VET 0x00038 /* VLAN Ether Type - RW */
@@ -125,7 +125,6 @@
125125
(0x054E4 + ((_i - 16) * 8)))
126126
#define E1000_SHRAL(_i) (0x05438 + ((_i) * 8))
127127
#define E1000_SHRAH(_i) (0x0543C + ((_i) * 8))
128-
#define E1000_TARC0_CB_MULTIQ_3_REQ (1 << 28 | 1 << 29)
129128
#define E1000_TDFH 0x03410 /* Tx Data FIFO Head - RW */
130129
#define E1000_TDFT 0x03418 /* Tx Data FIFO Tail - RW */
131130
#define E1000_TDFHS 0x03420 /* Tx Data FIFO Head Saved - RW */

0 commit comments

Comments
 (0)