diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-29 09:16:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-29 09:16:25 +0200 |
| commit | 348b346b238d9c0e5694c8d0b835a099cb383835 (patch) | |
| tree | 967d9c72a1d6d33a408a1ff0d732296dbe8d3674 /drivers/net/igbvf/igbvf.h | |
| parent | 6c697bdf08a09ce461e305a22362973036e95db3 (diff) | |
| parent | 52989765629e7d182b4f146050ebba0abf2cb0b7 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: we will merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/igbvf/igbvf.h')
| -rw-r--r-- | drivers/net/igbvf/igbvf.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h index d488733893a..8e9b67ebbf8 100644 --- a/drivers/net/igbvf/igbvf.h +++ b/drivers/net/igbvf/igbvf.h @@ -286,11 +286,7 @@ struct igbvf_info { }; /* hardware capability, feature, and workaround flags */ -#define FLAG_HAS_HW_VLAN_FILTER (1 << 0) -#define FLAG_HAS_JUMBO_FRAMES (1 << 1) -#define FLAG_MSI_ENABLED (1 << 2) -#define FLAG_RX_CSUM_ENABLED (1 << 3) -#define FLAG_TSO_FORCE (1 << 4) +#define IGBVF_FLAG_RX_CSUM_DISABLED (1 << 0) #define IGBVF_RX_DESC_ADV(R, i) \ (&((((R).desc))[i].rx_desc)) |