From: Kristian Høgsberg <krh@redhat.com>
Date: Tue, 10 Apr 2007 22:11:16 +0000 (-0400)
Subject: firewire: Byteswap iso header so all headers are presented as be32.
X-Git-Tag: v2.6.22-rc1~111^2~27
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15536221d1f09ae7707f70a183045ee20d8bcf17;p=linux-2.6

firewire: Byteswap iso header so all headers are presented as be32.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index b941239671..2229ea0b63 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1257,7 +1257,13 @@ static int handle_ir_dualbuffer_packet(struct context *context,
 	p = db + 1;
 	end = p + header_length;
 	while (p < end && i + ctx->base.header_size <= PAGE_SIZE) {
-		memcpy(ctx->header + i, p + 4, ctx->base.header_size);
+		/* The iso header is byteswapped to little endian by
+		 * the controller, but the remaining header quadlets
+		 * are big endian.  We want to present all the headers
+		 * as big endian, so we have to swap the first
+		 * quadlet. */
+		*(u32 *) (ctx->header + i) = __swab32(*(u32 *) (p + 4));
+		memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4);
 		i += ctx->base.header_size;
 		p += ctx->base.header_size + 4;
 	}