patch-2.4.23 linux-2.4.23/include/asm-ppc/scatterlist.h

• Lines: 24
• Date: 2003-11-28 10:26:21.000000000 -0800
• Orig file: linux-2.4.22/include/asm-ppc/scatterlist.h
• Orig date: 2003-06-13 07:51:38.000000000 -0700

diff -urN linux-2.4.22/include/asm-ppc/scatterlist.h linux-2.4.23/include/asm-ppc/scatterlist.h
@@ -9,9 +9,12 @@
 				 * or NULL for highmem page */
 	struct page * page;	/* Location for highmem page, if any */
 	unsigned int offset;	/* for highmem, page offset */
+	unsigned int length;	/* length at address or page+offset */
 
-	dma_addr_t dma_address;	/* phys/bus dma address		 */
-	unsigned int length;	/* length			 */
+	dma_addr_t dma_address;	/* phys/bus dma address	*/
+	unsigned int dma_length; /* number of bytes mapped at dma_address */
+	/* Note that if we coalesce multiple scatterlist elements,
+	   dma_length can be different from length */
 };
 
 /*
@@ -22,7 +25,7 @@
  * is 0.
  */
 #define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
+#define sg_dma_len(sg)          ((sg)->dma_length)
 
 #endif /* !(_PPC_SCATTERLIST_H) */
 #endif /* __KERNEL__ */