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/enic/enic_res.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/enic/enic_res.h')
| -rw-r--r-- | drivers/net/enic/enic_res.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h index 83bd172c356c..25be2734c3fe 100644 --- a/drivers/net/enic/enic_res.h +++ b/drivers/net/enic/enic_res.h | |||
| @@ -30,10 +30,11 @@ | |||
| 30 | #define ENIC_MIN_RQ_DESCS 64 | 30 | #define ENIC_MIN_RQ_DESCS 64 |
| 31 | #define ENIC_MAX_RQ_DESCS 4096 | 31 | #define ENIC_MAX_RQ_DESCS 4096 |
| 32 | 32 | ||
| 33 | #define ENIC_MIN_MTU 576 /* minimum for IPv4 */ | 33 | #define ENIC_MIN_MTU 68 |
| 34 | #define ENIC_MAX_MTU 9000 | 34 | #define ENIC_MAX_MTU 9000 |
| 35 | 35 | ||
| 36 | #define ENIC_MULTICAST_PERFECT_FILTERS 32 | 36 | #define ENIC_MULTICAST_PERFECT_FILTERS 32 |
| 37 | #define ENIC_UNICAST_PERFECT_FILTERS 32 | ||
| 37 | 38 | ||
| 38 | #define ENIC_NON_TSO_MAX_DESC 16 | 39 | #define ENIC_NON_TSO_MAX_DESC 16 |
| 39 | 40 | ||