diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 15:59:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 15:59:42 -0400 |
| commit | 70d374ea9907036e15574a5ce89219edd5baee10 (patch) | |
| tree | b858bb4a841eb91b1d91b41c33698d05fa7bfb37 /drivers/net/ixgb/ixgb.h | |
| parent | aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/ixgb/ixgb.h')
| -rw-r--r-- | drivers/net/ixgb/ixgb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index f8d3385c7842..c83271b38621 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h | |||
| @@ -119,7 +119,7 @@ struct ixgb_adapter; | |||
| 119 | * so a DMA handle can be stored along with the buffer */ | 119 | * so a DMA handle can be stored along with the buffer */ |
| 120 | struct ixgb_buffer { | 120 | struct ixgb_buffer { |
| 121 | struct sk_buff *skb; | 121 | struct sk_buff *skb; |
| 122 | uint64_t dma; | 122 | dma_addr_t dma; |
| 123 | unsigned long time_stamp; | 123 | unsigned long time_stamp; |
| 124 | uint16_t length; | 124 | uint16_t length; |
| 125 | uint16_t next_to_watch; | 125 | uint16_t next_to_watch; |