aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ieee1394/ieee1394_core.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h
index ad526523d0ef..11fd324ee045 100644
--- a/drivers/ieee1394/ieee1394_core.h
+++ b/drivers/ieee1394/ieee1394_core.h
@@ -37,7 +37,7 @@ struct hpsb_packet {
37 hpsb_unused, hpsb_queued, hpsb_pending, hpsb_complete 37 hpsb_unused, hpsb_queued, hpsb_pending, hpsb_complete
38 } __attribute__((packed)) state; 38 } __attribute__((packed)) state;
39 39
40 /* These are core internal. */ 40 /* These are core-internal. */
41 signed char tlabel; 41 signed char tlabel;
42 signed char ack_code; 42 signed char ack_code;
43 unsigned char tcode; 43 unsigned char tcode;
@@ -62,11 +62,15 @@ struct hpsb_packet {
62 /* Store jiffies for implementing bus timeouts. */ 62 /* Store jiffies for implementing bus timeouts. */
63 unsigned long sendtime; 63 unsigned long sendtime;
64 64
65 /* Sizes are in bytes. *data can be DMA-mapped. */ 65 /* Core-internal. */
66 size_t allocated_data_size; /* as allocated */ 66 size_t allocated_data_size; /* as allocated */
67
68 /* Sizes are in bytes. To be set by caller of hpsb_alloc_packet. */
67 size_t data_size; /* as filled in */ 69 size_t data_size; /* as filled in */
68 size_t header_size; /* as filled in, not counting the CRC */ 70 size_t header_size; /* as filled in, not counting the CRC */
69 quadlet_t *data; 71
72 /* Buffers */
73 quadlet_t *data; /* can be DMA-mapped */
70 quadlet_t header[5]; 74 quadlet_t header[5];
71 quadlet_t embedded_data[0]; /* keep as last member */ 75 quadlet_t embedded_data[0]; /* keep as last member */
72}; 76};