diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/cxgb4/t4_hw.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/cxgb4/t4_hw.h')
| -rw-r--r-- | drivers/net/cxgb4/t4_hw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/cxgb4/t4_hw.h b/drivers/net/cxgb4/t4_hw.h index 10a055565776..c26b455f37de 100644 --- a/drivers/net/cxgb4/t4_hw.h +++ b/drivers/net/cxgb4/t4_hw.h | |||
| @@ -42,6 +42,7 @@ enum { | |||
| 42 | MAX_MTU = 9600, /* max MAC MTU, excluding header + FCS */ | 42 | MAX_MTU = 9600, /* max MAC MTU, excluding header + FCS */ |
| 43 | EEPROMSIZE = 17408, /* Serial EEPROM physical size */ | 43 | EEPROMSIZE = 17408, /* Serial EEPROM physical size */ |
| 44 | EEPROMVSIZE = 32768, /* Serial EEPROM virtual address space size */ | 44 | EEPROMVSIZE = 32768, /* Serial EEPROM virtual address space size */ |
| 45 | EEPROMPFSIZE = 1024, /* EEPROM writable area size for PFn, n>0 */ | ||
| 45 | RSS_NENTRIES = 2048, /* # of entries in RSS mapping table */ | 46 | RSS_NENTRIES = 2048, /* # of entries in RSS mapping table */ |
| 46 | TCB_SIZE = 128, /* TCB size */ | 47 | TCB_SIZE = 128, /* TCB size */ |
| 47 | NMTUS = 16, /* size of MTU table */ | 48 | NMTUS = 16, /* size of MTU table */ |