Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[sfrench/cifs-2.6.git] / drivers / ieee1394 / ieee1394_core.h

diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h
index ad526523d0ef85fa556beda8b8b63d2e01fab424..21d50f73a210cbadfc6c39e128da8e06d0fa9310 100644 (file)
--- a/drivers/ieee1394/ieee1394_core.h
+++ b/drivers/ieee1394/ieee1394_core.h
@@ -24,9 +24,8 @@ struct hpsb_packet {
 
        nodeid_t node_id;
 
-       /* Async and Iso types should be clear, raw means send-as-is, do not
-        * CRC!  Byte swapping shall still be done in this case. */
-       enum { hpsb_async, hpsb_iso, hpsb_raw } __attribute__((packed)) type;
+       /* hpsb_raw = send as-is, do not CRC (but still byte-swap it) */
+       enum { hpsb_async, hpsb_raw } __attribute__((packed)) type;
 
        /* Okay, this is core internal and a no care for hosts.
         * queued   = queued for sending
@@ -37,7 +36,7 @@ struct hpsb_packet {
                hpsb_unused, hpsb_queued, hpsb_pending, hpsb_complete
        } __attribute__((packed)) state;
 
-       /* These are core internal. */
+       /* These are core-internal. */
        signed char tlabel;
        signed char ack_code;
        unsigned char tcode;
@@ -62,11 +61,15 @@ struct hpsb_packet {
        /* Store jiffies for implementing bus timeouts. */
        unsigned long sendtime;
 
-       /* Sizes are in bytes. *data can be DMA-mapped. */
+       /* Core-internal.  */
        size_t allocated_data_size;     /* as allocated */
+
+       /* Sizes are in bytes. To be set by caller of hpsb_alloc_packet. */
        size_t data_size;               /* as filled in */
        size_t header_size;             /* as filled in, not counting the CRC */
-       quadlet_t *data;
+
+       /* Buffers */
+       quadlet_t *data;                /* can be DMA-mapped */
        quadlet_t header[5];
        quadlet_t embedded_data[0];     /* keep as last member */
 };