diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 05:32:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 05:32:52 -0400 |
| commit | e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1 (patch) | |
| tree | 4f84567261682d8ec2ad4102bce1ff970a6eed1a /drivers/net/e1000e/e1000.h | |
| parent | 9fcaff0e660d886e9a766460adbe558dd25de31b (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/iommu
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
| -rw-r--r-- | drivers/net/e1000e/e1000.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index cf57050d99d..ac4e506b4f8 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h | |||
| @@ -326,6 +326,7 @@ struct e1000_info { | |||
| 326 | #define FLAG_RX_CSUM_ENABLED (1 << 28) | 326 | #define FLAG_RX_CSUM_ENABLED (1 << 28) |
| 327 | #define FLAG_TSO_FORCE (1 << 29) | 327 | #define FLAG_TSO_FORCE (1 << 29) |
| 328 | #define FLAG_RX_RESTART_NOW (1 << 30) | 328 | #define FLAG_RX_RESTART_NOW (1 << 30) |
| 329 | #define FLAG_MSI_TEST_FAILED (1 << 31) | ||
| 329 | 330 | ||
| 330 | #define E1000_RX_DESC_PS(R, i) \ | 331 | #define E1000_RX_DESC_PS(R, i) \ |
| 331 | (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) | 332 | (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) |