diff --git a/[refs] b/[refs]
index 05b4d4c7a797..79950bacbdc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17a624869ea470e33c708871978223c3d9a4c417
+refs/heads/master: 6552731a058a4facefd921b0b45a9a5392baa5ea
diff --git a/trunk/drivers/ieee1394/ieee1394_core.h b/trunk/drivers/ieee1394/ieee1394_core.h
index ad526523d0ef..11fd324ee045 100644
--- a/trunk/drivers/ieee1394/ieee1394_core.h
+++ b/trunk/drivers/ieee1394/ieee1394_core.h
@@ -37,7 +37,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 +62,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 */
 };